diff options
author | dotnet-bot <dotnet-bot@microsoft.com> | 2020-11-20 05:50:28 +0300 |
---|---|---|
committer | dotnet-bot <dotnet-bot@microsoft.com> | 2020-11-20 05:50:28 +0300 |
commit | 9699b939f94b7524a178821d78addefa5af5d750 (patch) | |
tree | 9ee48e17da5091a240ce0854a44226af54d20c69 | |
parent | 19d7b818002d225ac5140c5f63cd8a13d7fa095d (diff) | |
parent | 790c4dc2cf59e16e6144f7790328d563ca310533 (diff) |
Merge in 'release/3.1' changesv3.1.11
-rw-r--r-- | eng/Version.Details.xml | 12 | ||||
-rw-r--r-- | eng/Versions.props | 2 | ||||
-rw-r--r-- | eng/common/templates/post-build/post-build.yml | 2 | ||||
-rw-r--r-- | global.json | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6598338a7..5c90168d3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -418,17 +418,17 @@ <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20509.7"> + <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20569.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e4584b56c5334067d30a04dd6b2d1d724ed7ccc3</Sha> + <Sha>c8e0cc19e7406ab0e2b2998b9c7a9249ef801b19</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20509.7"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20569.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e4584b56c5334067d30a04dd6b2d1d724ed7ccc3</Sha> + <Sha>c8e0cc19e7406ab0e2b2998b9c7a9249ef801b19</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20509.7"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20569.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>e4584b56c5334067d30a04dd6b2d1d724ed7ccc3</Sha> + <Sha>c8e0cc19e7406ab0e2b2998b9c7a9249ef801b19</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.EntityFrameworkCore"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 4366aab80c..f7daa93be2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ --> <PropertyGroup Label="Automated"> <!-- Packages from dotnet/arcade --> - <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20509.7</MicrosoftDotNetGenAPIPackageVersion> + <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20569.8</MicrosoftDotNetGenAPIPackageVersion> <!-- Packages from dotnet/roslyn --> <MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion> <!-- Packages from dotnet/core-setup --> diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 8ad0f9f66c..ff047d0fb1 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -1,6 +1,6 @@ parameters: enableSourceLinkValidation: false - enableSigningValidation: true + enableSigningValidation: false enableSymbolValidation: false enableNugetValidation: true publishInstallersAndChecksums: false diff --git a/global.json b/global.json index 56a6872376..8e8c3fa93c 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20509.7", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20509.7" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20569.8", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20569.8" } } |