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

[release/5.0] Update dependencies from dotnet/arcade (#26817) 

[release/5.0] Update dependencies from dotnet/arcade


 - `NETCOREAPP5_0` -> `NET5_0`

 - Add PublishIISAssets To Fix Test
This commit is contained in:
dotnet-maestro[bot] 2020-10-14 04:35:26 +00:00 committed by GitHub
parent 2aaae9e954
commit aa50176707
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 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

@ -308,17 +308,17 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b928f03ffb8684b476cdf5c46fb92561bfbdc23c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20506.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20510.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha>
<Sha>6813f5aa511a7a4498fa217a54219b5704a01f83</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20506.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20510.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha>
<Sha>6813f5aa511a7a4498fa217a54219b5704a01f83</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20506.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20510.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ee39cd1573dbb8011f343e1037af51d4fc00a747</Sha>
<Sha>6813f5aa511a7a4498fa217a54219b5704a01f83</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

2
eng/Versions.props
View File

@ -130,7 +130,7 @@
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.0</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20506.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20510.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<!--

8
global.json
View File

@ -1,9 +1,9 @@
{
"sdk": {
"version": "5.0.100-rc.1.20452.10"
"version": "5.0.100-rc.2.20479.15"
},
"tools": {
"dotnet": "5.0.100-rc.1.20452.10",
"dotnet": "5.0.100-rc.2.20479.15",
"runtimes": {
"dotnet/x64": [
"2.1.18",
@ -30,7 +30,7 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.15.2",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20506.7",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20506.7"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20510.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20510.1"
}
}

2
src/Components/WebAssembly/Sdk/integrationtests/WasmPublishIntegrationTest.cs
View File

@ -196,7 +196,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
var webConfigContents = "test webconfig contents";
AddFileToProject(project, "web.config", webConfigContents);
var result = await MSBuildProcessManager.DotnetMSBuild(project, "Publish");
var result = await MSBuildProcessManager.DotnetMSBuild(project, "Publish", $"/p:PublishIISAssets=true");
Assert.BuildPassed(result);

2
src/Shared/BenchmarkRunner/DefaultCoreConfig.cs
View File

@ -34,7 +34,7 @@ namespace BenchmarkDotNet.Attributes
.WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.0", null, ".NET Core 3.0")))
#elif NETCOREAPP3_1
.WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.1", null, ".NET Core 3.1")))
#elif NETCOREAPP5_0
#elif NET5_0
.WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net5.0", null, ".NET Core 5.0")))
#else
#error Target frameworks need to be updated.