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 2020-12-11 17:16:50 +00:00
parent 6b3724c21a a14235b80f
commit 03ac1f2c9a
5 changed files with 14 additions and 13 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://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha> <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20560.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20580.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6f54e001de0c52e52578e5252cb279f5bc9a2eb6</Sha> <Sha>79333c52da3f213509ab79bd92924660e04e668c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20560.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20580.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6f54e001de0c52e52578e5252cb279f5bc9a2eb6</Sha> <Sha>79333c52da3f213509ab79bd92924660e04e668c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20560.3"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20580.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6f54e001de0c52e52578e5252cb279f5bc9a2eb6</Sha> <Sha>79333c52da3f213509ab79bd92924660e04e668c</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

2
eng/Versions.props
View File

@ -135,7 +135,7 @@
<MicrosoftEntityFrameworkCorePackageVersion>5.0.1</MicrosoftEntityFrameworkCorePackageVersion> <MicrosoftEntityFrameworkCorePackageVersion>5.0.1</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreDesignPackageVersion> <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.1</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Packages from dotnet/arcade --> <!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20560.3</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20580.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<!-- <!--

5
eng/common/SetupNugetSources.ps1
View File

@ -99,8 +99,9 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
function EnablePrivatePackageSources($DisabledPackageSources) { function EnablePrivatePackageSources($DisabledPackageSources) {
$maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
ForEach ($DisabledPackageSource in $maestroPrivateSources) { ForEach ($DisabledPackageSource in $maestroPrivateSources) {
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled" Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource"
$DisabledPackageSource.SetAttribute("value", "false") # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries
$DisabledPackageSources.RemoveChild($DisabledPackageSource)
} }
} }

4
eng/common/SetupNugetSources.sh
View File

@ -158,8 +158,8 @@ if [ "$?" == "0" ]; then
for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do
if [[ $DisabledSourceName == darc-int* ]] if [[ $DisabledSourceName == darc-int* ]]
then then
OldDisableValue="add key=\"$DisabledSourceName\" value=\"true\"" OldDisableValue="<add key=\"$DisabledSourceName\" value=\"true\" />"
NewDisableValue="add key=\"$DisabledSourceName\" value=\"false\"" NewDisableValue="<!-- Reenabled for build : $DisabledSourceName -->"
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile
echo "Neutralized disablePackageSources entry for '$DisabledSourceName'" echo "Neutralized disablePackageSources entry for '$DisabledSourceName'"
fi fi

4
global.json
View File

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