fszlin · fszlin · Jan 3, 2023 · Jan 2, 2023 · Jan 3, 2023 · Jan 3, 2023
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -4,15 +4,15 @@ build:
   project: Certes.sln
 
 skip_tags: true
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 skip_commits:
   files:
-  - '*.md'
+    - "*.md"
   #- '*.yml'
 
-clone_depth: 1  
-nuget:  
+clone_depth: 1
+nuget:
   disable_publish_on_pr: true
 
 environment:
@@ -38,8 +38,8 @@ before_build:
   - cmd: dotnet restore
 
 build_script:
-  - ps: dotnet test ./test/Certes.Tests/Certes.Tests.csproj --framework netcoreapp3.1
-  - ps: dotnet test ./test/Certes.Tests.Integration/Certes.Tests.Integration.csproj --framework netcoreapp3.1
+  - ps: dotnet test ./test/Certes.Tests/Certes.Tests.csproj --framework net6.0
+  - ps: dotnet test ./test/Certes.Tests.Integration/Certes.Tests.Integration.csproj --framework net6.0
 
 test: off
 before_test:
@@ -49,23 +49,23 @@ test_script:
 on_success:
   # gh-pages
   - ps: |
-        If (-Not $env:APPVEYOR_PULL_REQUEST_TITLE -And $env:APPVEYOR_REPO_BRANCH -Eq "main")
-        {
-          git clone -q --depth=1 https://github.com/fszlin/docstrap.git docs/docstrap
-          choco install docfx -y
-          docfx docs/docfx.json
-          git config --global core.autocrlf false
-          git config --global credential.helper store
-          git config --global user.email $env:APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL
-          git config --global user.name $env:APPVEYOR_REPO_COMMIT_AUTHOR
-          Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GITHUB_ACCESS_TOKEN):[email protected]`n"
-          git clone https://github.com/fszlin/certes.git -b gh-pages gh-pages -q
-          Copy-Item ./docs/_site/* ./gh-pages/ -Recurse -Container -Force
-          cd gh-pages
-          git add -A 2>&1
-          git commit -m $env:APPVEYOR_REPO_COMMIT_MESSAGE -q
-          git push origin gh-pages -q
-          cd $env:APPVEYOR_BUILD_FOLDER
-        }
+      If (-Not $env:APPVEYOR_PULL_REQUEST_TITLE -And $env:APPVEYOR_REPO_BRANCH -Eq "main")
+      {
+        git clone -q --depth=1 https://github.com/fszlin/docstrap.git docs/docstrap
+        choco install docfx -y
+        docfx docs/docfx.json
+        git config --global core.autocrlf false
+        git config --global credential.helper store
+        git config --global user.email $env:APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL
+        git config --global user.name $env:APPVEYOR_REPO_COMMIT_AUTHOR
+        Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:GITHUB_ACCESS_TOKEN):[email protected]`n"
+        git clone https://github.com/fszlin/certes.git -b gh-pages gh-pages -q
+        Copy-Item ./docs/_site/* ./gh-pages/ -Recurse -Container -Force
+        cd gh-pages
+        git add -A 2>&1
+        git commit -m $env:APPVEYOR_REPO_COMMIT_MESSAGE -q
+        git push origin gh-pages -q
+        cd $env:APPVEYOR_BUILD_FOLDER
+      }
 
 configuration: Release
diff --git a/.gitignore b/.gitignore
@@ -252,3 +252,4 @@ local.settings.json
 .vscode/
 .DS_Store
 *.arm.json
+*Zip Deploy.json
diff --git a/.travis.yml b/.travis.yml
@@ -15,5 +15,5 @@ branches:
     - vnext
 script:
   - dotnet restore
-  - dotnet test ./test/Certes.Tests/Certes.Tests.csproj --framework net5.0
-  - dotnet test ./test/Certes.Tests.Integration/Certes.Tests.Integration.csproj --framework net5.0
+  - dotnet test ./test/Certes.Tests/Certes.Tests.csproj --framework net6.0
+  - dotnet test ./test/Certes.Tests.Integration/Certes.Tests.Integration.csproj --framework net6.0
diff --git a/Certes.sln b/Certes.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29911.98
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33209.295
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{E9E7371E-AB81-4ECF-9684-2ACB1EF7FF67}"
 	ProjectSection(SolutionItems) = preProject
@@ -34,10 +34,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Certes.Cli", "src\Certes.Cl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Certes.Tests", "test\Certes.Tests\Certes.Tests.csproj", "{67194186-A678-40D3-BEB2-A5572539C423}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Certes.Tests.Web", "test\Certes.Tests.Web\Certes.Tests.Web.csproj", "{38D99EC8-967B-495D-AE33-18FAF4DAE161}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Certes.Tests.Integration", "test\Certes.Tests.Integration\Certes.Tests.Integration.csproj", "{741DD8E1-DDCB-4D34-9E65-FEE6AC861022}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Certes.Func", "test\Certes.Func\Certes.Func.csproj", "{DEAFA502-C0AB-4B9D-B6A8-6A04C9851800}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -56,14 +56,14 @@ Global
 		{67194186-A678-40D3-BEB2-A5572539C423}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{67194186-A678-40D3-BEB2-A5572539C423}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{67194186-A678-40D3-BEB2-A5572539C423}.Release|Any CPU.Build.0 = Release|Any CPU
-		{38D99EC8-967B-495D-AE33-18FAF4DAE161}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{38D99EC8-967B-495D-AE33-18FAF4DAE161}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{38D99EC8-967B-495D-AE33-18FAF4DAE161}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{38D99EC8-967B-495D-AE33-18FAF4DAE161}.Release|Any CPU.Build.0 = Release|Any CPU
 		{741DD8E1-DDCB-4D34-9E65-FEE6AC861022}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{741DD8E1-DDCB-4D34-9E65-FEE6AC861022}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{741DD8E1-DDCB-4D34-9E65-FEE6AC861022}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{741DD8E1-DDCB-4D34-9E65-FEE6AC861022}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEAFA502-C0AB-4B9D-B6A8-6A04C9851800}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEAFA502-C0AB-4B9D-B6A8-6A04C9851800}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEAFA502-C0AB-4B9D-B6A8-6A04C9851800}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEAFA502-C0AB-4B9D-B6A8-6A04C9851800}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -72,8 +72,8 @@ Global
 		{7AA85BF4-2A4F-42C8-A107-82B22C640C4E} = {7B11358C-CCDB-4A64-8CAF-9AA29AFD7DE3}
 		{B416791A-F073-446B-87B8-0D63049DB1A8} = {7B11358C-CCDB-4A64-8CAF-9AA29AFD7DE3}
 		{67194186-A678-40D3-BEB2-A5572539C423} = {556F2BFB-DE9B-4673-BADC-63C365DA2A55}
-		{38D99EC8-967B-495D-AE33-18FAF4DAE161} = {556F2BFB-DE9B-4673-BADC-63C365DA2A55}
 		{741DD8E1-DDCB-4D34-9E65-FEE6AC861022} = {556F2BFB-DE9B-4673-BADC-63C365DA2A55}
+		{DEAFA502-C0AB-4B9D-B6A8-6A04C9851800} = {556F2BFB-DE9B-4673-BADC-63C365DA2A55}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1E394B03-F0AB-4024-BDCB-334EE482380C}

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,88 +1,85 @@
 trigger:
-- main
-- release
+  - main
+  - release
 
 pr:
-- main
+  - main
 
 stages:
-
-- stage: ver
-  displayName: Determine Version
-  jobs:
-  - job: ver
+  - stage: ver
     displayName: Determine Version
-    pool:
-      vmImage: 'ubuntu-latest'
-
-    steps:
-    - task: gitversion/setup@0
-      displayName: Install GitVersion
-      inputs:
-        versionSpec: '5.x'
-
-    - task: gitversion/execute@0
-      displayName: Determine Version
-      inputs:
-        useConfigFile: true
-        configFilePath: 'GitVersion.yml'
-      name: version
+    jobs:
+      - job: ver
+        displayName: Determine Version
+        pool:
+          vmImage: "ubuntu-latest"
 
-- stage: test
-  displayName: Test
-  dependsOn: ver
-  jobs:
+        steps:
+          - task: gitversion/setup@0
+            displayName: Install GitVersion
+            inputs:
+              versionSpec: "5.x"
 
-  - template: scripts/build.yml
-    parameters:
-      name: Linux_net50
-      displayName: Linux - net5.0
-      framework: net5.0
-      appFramework: net5.0
-      pool:
-        vmImage: 'ubuntu-latest'
+          - task: gitversion/execute@0
+            displayName: Determine Version
+            inputs:
+              useConfigFile: true
+              configFilePath: "GitVersion.yml"
+            name: version
 
-  - template: scripts/build.yml
-    parameters:
-      name: macOS_net50
-      displayName: macOS - net5.0
-      framework: net5.0
-      appFramework: net5.0
-      pool:
-        vmImage: 'macOS-latest'
+  - stage: test
+    displayName: Test
+    dependsOn: ver
+    jobs:
+      - template: scripts/build.yml
+        parameters:
+          name: Linux_net60
+          displayName: Linux - net6.0
+          framework: net6.0
+          appFramework: net6.0
+          pool:
+            vmImage: "ubuntu-latest"
 
-  - template: scripts/build.yml
-    parameters:
-      name: Windows_net50
-      displayName: Windows - net5.0
-      framework: net5.0
-      appFramework: net5.0
-      pool:
-        vmImage: 'windows-latest'
+      - template: scripts/build.yml
+        parameters:
+          name: macOS_net60
+          displayName: macOS - net6.0
+          framework: net6.0
+          appFramework: net6.0
+          pool:
+            vmImage: "macOS-latest"
 
-  - template: scripts/build.yml
-    parameters:
-      name: Windows_net461
-      displayName: Windows - net461
-      framework: net461
-      appFramework: net461
-      pool:
-        vmImage: 'windows-latest'
+      - template: scripts/build.yml
+        parameters:
+          name: Windows_net60
+          displayName: Windows - net6.0
+          framework: net6.0
+          appFramework: net6.0
+          pool:
+            vmImage: "windows-latest"
 
-- stage: pack
-  displayName: Pack
-  dependsOn:
-  - ver
-  jobs:
+      - template: scripts/build.yml
+        parameters:
+          name: Windows_net462
+          displayName: Windows - net462
+          framework: net462
+          appFramework: net462
+          pool:
+            vmImage: "windows-latest"
 
-  - template: scripts/pack.yml
-    parameters:
-      name: 'pack'
-      displayName: 'Pack Certes'
-      projectName: 'Certes'
+  - stage: pack
+    displayName: Pack
+    dependsOn:
+      - ver
+    jobs:
+      - template: scripts/pack.yml
+        parameters:
+          name: "pack"
+          displayName: "Pack Certes"
+          projectName: "Certes"
 
-  - template: scripts/pack.yml
-    parameters:
-      name: 'pack_tool'
-      displayName: 'Pack Certes.Tool'
-      projectName: 'Certes.Cli'
+      - template: scripts/pack.yml
+        parameters:
+          name: "pack_tool"
+          displayName: "Pack Certes.Tool"
+          projectName: "Certes.Cli"
diff --git a/misc/certes.props b/misc/certes.props
@@ -4,14 +4,15 @@
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <LangVersion>Latest</LangVersion>
     <SignAssembly>true</SignAssembly>
-    <PublicSign Condition="'$(TargetFramework)' != 'net461'">True</PublicSign>
+    <PublicSign Condition="'$(TargetFramework)' != 'net462'">True</PublicSign>
     <AssemblyOriginatorKeyFile>../../misc/certes.snk</AssemblyOriginatorKeyFile>
     <AssemblyVersion>3.0.0</AssemblyVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(APPVEYOR)' != ''">
     <CertesFileVersionSuffix>.$(APPVEYOR_BUILD_NUMBER)</CertesFileVersionSuffix>
     <CertesInformationalVersionSuffix>-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_BUILD_NUMBER)</CertesInformationalVersionSuffix>
-    <CertesPackageVersionSuffix Condition="'$(APPVEYOR_REPO_BRANCH)' != 'release'">$(CertesInformationalVersionSuffix)</CertesPackageVersionSuffix>
+    <CertesPackageVersionSuffix Condition="'$(APPVEYOR_REPO_BRANCH)' != 'release'">
+      $(CertesInformationalVersionSuffix)</CertesPackageVersionSuffix>
   </PropertyGroup>
   <PropertyGroup>
     <Version>$(AssemblyVersion)$(CertesPackageVersionSuffix)</Version>
@@ -23,7 +24,8 @@
     <AssemblyVersion Condition="$(CERTES_ASSEMBLY_VERSION) != ''">$(CERTES_ASSEMBLY_VERSION)</AssemblyVersion>
     <Version Condition="$(CERTES_PACKAGE_VERSION) != ''">$(CERTES_PACKAGE_VERSION)</Version>
     <FileVersion Condition="$(CERTES_FILE_VERSION) != ''">$(CERTES_FILE_VERSION)</FileVersion>
-    <InformationalVersion Condition="$(CERTES_INFORMATIONAL_VERSION) != ''">$(CERTES_INFORMATIONAL_VERSION)</InformationalVersion>
+    <InformationalVersion Condition="$(CERTES_INFORMATIONAL_VERSION) != ''">
+      $(CERTES_INFORMATIONAL_VERSION)</InformationalVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>