huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge in 'release/5.0' changes

This commit is contained in:
dotnet-bot 2021-03-10 00:01:16 +00:00
parent 99b15ac290 bf9a344a24
commit 83610bb9e8
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eng/Version.Details.xml
View File

@ -313,17 +313,17 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21112.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21159.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d8c68c834bcca3f721ad1550404807e301ba7afe</Sha>
<Sha>f185e9dfcae59cf5024d3ce17884f03c8f8f4c70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21112.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21159.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d8c68c834bcca3f721ad1550404807e301ba7afe</Sha>
<Sha>f185e9dfcae59cf5024d3ce17884f03c8f8f4c70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21112.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21159.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d8c68c834bcca3f721ad1550404807e301ba7afe</Sha>
<Sha>f185e9dfcae59cf5024d3ce17884f03c8f8f4c70</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

2
eng/Versions.props
View File

@ -136,7 +136,7 @@
<MicrosoftEntityFrameworkCorePackageVersion>5.0.4</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.4</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21112.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21159.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<!--

2
eng/common/post-build/publish-using-darc.ps1
View File

@ -54,7 +54,7 @@ try {
--id $buildId `
--publishing-infra-version $PublishingInfraVersion `
--default-channels `
--source-branch master `
--source-branch main `
--azdev-pat $AzdoToken `
--bar-uri $MaestroApiEndPoint `
--password $MaestroToken `

4
global.json
View File

@ -30,7 +30,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.15.2",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21112.3",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21112.3"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.2",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21159.2"
}
}