Merge pull request #88 from max-ieremenko/release/1.4.7

Release/1.4.7
max-ieremenko · May 21, 2022 · f77e25e · f77e25e
2 parents 1995ae3 + 668378d
commit f77e25e
Show file tree

Hide file tree

Showing 242 changed files with 2,878 additions and 1,668 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,8 +33,8 @@ jobs:
       run: dotnet --info
 
     - name: Install ThirdPartyLibraries
-      shell: cmd
-      run: dotnet tool install --global ThirdPartyLibraries.GlobalTool
+      shell: pwsh
+      run: Install-Module -Name ThirdPartyLibraries -RequiredVersion 3.1.0 -Force
 
     - name: Install InvokeBuild
       shell: pwsh

diff --git a/Benchmarks/ServiceModel.Grpc.Benchmarks/ServiceModel.Grpc.Benchmarks.csproj b/Benchmarks/ServiceModel.Grpc.Benchmarks/ServiceModel.Grpc.Benchmarks.csproj
@@ -8,9 +8,9 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
     <PackageReference Include="Grpc.Net.Client" Version="$(GrpcNetVersion)" />
-    <PackageReference Include="MagicOnion" Version="4.3.1" />
-    <PackageReference Include="MagicOnion.Server" Version="4.3.1" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.5" />
+    <PackageReference Include="MagicOnion" Version="4.4.1" />
+    <PackageReference Include="MagicOnion.Server" Version="4.4.1" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.5" />
     <PackageReference Include="protobuf-net.Grpc" Version="1.0.152" />
     <PackageReference Include="protobuf-net.Grpc.AspNetCore" Version="1.0.152" />
     <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />

diff --git a/Build/README.md b/Build/README.md
@@ -21,7 +21,7 @@ To run CI build locally
 - install ThirdPartyLibraries
 
     ``` powershell
-    PS> dotnet tool install --global ThirdPartyLibraries.GlobalTool
+    PS> Install-Module -Name ThirdPartyLibraries -RequiredVersion 3.1.0
     ```
 
 - switch docker to linux containers

diff --git a/Build/build-locally.ps1 b/Build/build-locally.ps1
@@ -1,5 +1,5 @@
-#Install-Module -Name InvokeBuild -RequiredVersion 5.9.9.0
 #Requires -Modules @{ ModuleName="InvokeBuild"; RequiredVersion="5.9.9.0" }
+#Requires -Modules @{ ModuleName="ThirdPartyLibraries"; RequiredVersion="3.1.0" }
 
 $ErrorActionPreference = "Stop"
 Set-StrictMode -Version Latest

diff --git a/Build/scripts/Write-ThirdPartyNotices.ps1 b/Build/scripts/Write-ThirdPartyNotices.ps1
@@ -1,33 +1,16 @@
 function Write-ThirdPartyNotices {
     param (
-        $appNames, $sources, $repository, $out
+        $appNames, $sources, $repository, $title, $out
     )
 
     $appName = $appNames[0]
-    $generateAppNames = $appNames | ForEach-Object {"-appName", $_}
-    $source = $sources | ForEach-Object {"-source", $_}
     $outTemp = Join-Path $out "Temp"
 
-    exec {
-        ThirdPartyLibraries update `
-            -appName $appName `
-            $source `
-            -repository $repository
-    }
+    Update-ThirdPartyLibrariesRepository -AppName $appName -Source $sources -Repository $repository -InformationAction Continue
 
-    exec {
-        ThirdPartyLibraries validate `
-            -appName $appName `
-            $source `
-            -repository $repository
-    }
+    Test-ThirdPartyLibrariesRepository -AppName $appName -Source $sources -Repository $repository -InformationAction Continue
 
-    exec {
-        ThirdPartyLibraries generate `
-            $generateAppNames `
-            -repository $repository `
-            -to $outTemp
-    }
+    Publish-ThirdPartyNotices -AppName $appNames -Repository $repository -Title $title -To $outTemp -InformationAction Continue
 
     $licenseFile = $appName + "ThirdPartyNotices.txt"
     Move-Item (Join-Path $outTemp "ThirdPartyNotices.txt") (Join-Path $out $licenseFile) -Force

diff --git a/Build/step-third-party-notices.ps1 b/Build/step-third-party-notices.ps1
@@ -4,6 +4,10 @@ param(
     $Settings
 )
 
+Enter-Build {
+    $releaseVersion = (Select-Xml -Path (Join-Path $Settings.sources "Versions.props") -XPath "Project/PropertyGroup/ServiceModelGrpcVersion").Node.InnerText
+}
+
 task Default Core, AspNetCore, Swashbuckle, NSwag, DesignTime, SelfHost, ProtoBufMarshaller, MessagePackMarshaller
 
 task Core {
@@ -15,7 +19,7 @@ task Core {
         (Join-Path $Settings.sources "ServiceModel.Grpc.TestApi")
     )
 
-    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty $Settings.buildOut
+    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty "ServiceModel.Grpc $releaseVersion" $Settings.buildOut
 }
 
 task AspNetCore {
@@ -27,7 +31,7 @@ task AspNetCore {
         (Join-Path $Settings.sources "ServiceModel.Grpc.AspNetCore.TestApi")
     )
 
-    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty $Settings.buildOut
+    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty "ServiceModel.Grpc.AspNetCore $releaseVersion" $Settings.buildOut
 }
 
 task Swashbuckle {
@@ -40,7 +44,7 @@ task Swashbuckle {
         (Join-Path $Settings.sources "ServiceModel.Grpc.AspNetCore.TestApi")
     )
 
-    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty $Settings.buildOut
+    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty "ServiceModel.Grpc.AspNetCore.Swashbuckle $releaseVersion" $Settings.buildOut
 }
 
 task NSwag {
@@ -53,7 +57,7 @@ task NSwag {
         (Join-Path $Settings.sources "ServiceModel.Grpc.AspNetCore.TestApi")
     )
 
-    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty $Settings.buildOut
+    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty "ServiceModel.Grpc.AspNetCore.NSwag $releaseVersion" $Settings.buildOut
 }
 
 task DesignTime {
@@ -67,7 +71,7 @@ task DesignTime {
         (Join-Path $Settings.sources "ServiceModel.Grpc.DesignTime.Generator.Test")
     )
 
-    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty $Settings.buildOut
+    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty "ServiceModel.Grpc.DesignTime $releaseVersion" $Settings.buildOut
 }
 
 
@@ -79,7 +83,7 @@ task SelfHost {
         (Join-Path $Settings.sources "ServiceModel.Grpc.SelfHost.Test")
     )
 
-    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty $Settings.buildOut
+    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty "ServiceModel.Grpc.SelfHost $releaseVersion" $Settings.buildOut
 }
 
 task ProtoBufMarshaller {
@@ -89,7 +93,7 @@ task ProtoBufMarshaller {
         (Join-Path $Settings.sources "ServiceModel.Grpc.ProtoBufMarshaller")
     )
 
-    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty $Settings.buildOut
+    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty "ServiceModel.Grpc.ProtoBufMarshaller $releaseVersion" $Settings.buildOut
 }
 
 task MessagePackMarshaller {
@@ -99,5 +103,5 @@ task MessagePackMarshaller {
         (Join-Path $Settings.sources "ServiceModel.Grpc.MessagePackMarshaller")
     )
 
-    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty $Settings.buildOut
+    Write-ThirdPartyNotices $appNames $sources $Settings.thirdParty "ServiceModel.Grpc.MessagePackMarshaller $releaseVersion" $Settings.buildOut
 }
diff --git a/Build/third-party-libraries/configuration/appsettings.json b/Build/third-party-libraries/configuration/appsettings.json
@@ -7,7 +7,7 @@
       "byProjectName": []
     },
     "internalPackages": {
-      "byName": [ "StyleCop\\.Analyzers" ],
+      "byName": [ "StyleCop\\.Analyzers", "Microsoft\\.SourceLink\\.GitHub" ],
       "byProjectName": [ "\\.Test$", "\\.TestApi$" ]
     }
   },
@@ -65,5 +65,8 @@
         ]
       }
     ]
+  },
+  "skipCertificateCheck": {
+    "byHost": [ "localhost" ]
   }
 }
diff --git a/Build/third-party-libraries/configuration/third-party-notices-template.txt b/Build/third-party-libraries/configuration/third-party-notices-template.txt
@@ -1,5 +1,5 @@
-ServiceModel.Grpc
-*****************
+{{Title}}
+{% for i in (1..Title.size) %}*{% endfor %}
 
 THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
 
@@ -9,9 +9,9 @@ THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
     Authors: {{package.Author}}
 {%- endif -%}
 {%- if package.Copyright -%}
-	Copyright: {{package.Copyright}}
+    Copyright: {{package.Copyright}}
 {%- endif -%}
-	License: {{package.License.FullName}}, full text can be found at{% for i in package.License.HRefs %} {{i}}{% endfor %}
+    License: {{package.PackageLicense.FullName}}, full text can be found at{% for i in package.PackageLicense.HRefs %} {{i}}{% endfor %}
 {%- if package.ThirdPartyNotices -%}
 
 {{package.ThirdPartyNotices}}