mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[main] Update dependencies from dotnet/sdk (#10185)

Browse source 
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-preview.4.21205.3 to 6.0.0-preview.4.21213.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-preview.4.21207.16 to 6.0.0-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.4.21206.2 to 6.0.100-preview.4.21213.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.4.21205.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.4.21206.2 to 6.0.0-preview.4.21212.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.4.21206.1 to 6.0.0-preview.4.21212.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 11.4.2-beta.21204.5 to 11.4.2-beta.21212.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.2.21207.1 to 6.0.100-preview.2.21212.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 3.10.0-3.21208.2 to 3.10.0-3.21213.18 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 5.10.0-preview.2.7190 to 5.10.0-preview.2.7203 (parent: Microsoft.NET.Sdk)

 - Merge branch 'main' into darc-main-4ed89ff0-d420-4cac-9486-36d8a69c8e12

 - Set DOTNET_CLI_RUN_MSBUILD_OUTOFPROC=true for SdkTests.csproj

Forces the started dotnet CLI to not load MSBuild.dll in-proc, see https://github.com/dotnet/installer/pull/10185#issuecomment-819463807.
This commit is contained in:
dotnet-maestro[bot] 2021-04-14 12:49:16 +00:00 • committed by GitHub
parent a069111a95
commit 73f0a697e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 69 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/SdkTests/SdkTests.csproj
View file

@ -266,7 +266,7 @@
<Exec Command="$(ToolRunPrefix)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
WorkingDirectory="$(TestLocalToolFolder)"
EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>
EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME);DOTNET_CLI_RUN_MSBUILD_OUTOFPROC=true"/>
</Target>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />