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

[master] Update dependencies from dotnet/sdk (#6774)

Browse source 
* Update dependencies from https://github.com/dotnet/sdk build 20200311.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20161.2

* Update dependencies from https://github.com/dotnet/sdk build 20200311.4

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.4
- Microsoft.NET.Sdk - 5.0.100-preview.3.20161.4

* Update dependencies from https://github.com/dotnet/sdk build 20200311.6

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.6
- Microsoft.NET.Sdk - 5.0.100-preview.3.20161.6

* Update dependencies from https://github.com/dotnet/sdk build 20200311.7

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20161.7
- Microsoft.NET.Sdk - 5.0.100-preview.3.20161.7

* Update dependencies from https://github.com/dotnet/sdk build 20200312.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.1

* Update dependencies from https://github.com/dotnet/sdk build 20200312.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.2

* Update dependencies from https://github.com/dotnet/sdk build 20200312.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.3

* Update dependencies from https://github.com/dotnet/sdk build 20200312.5

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.5
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.5

* Update dependencies from https://github.com/dotnet/sdk build 20200312.7

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.7
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.7

* Update dependencies from https://github.com/dotnet/sdk build 20200312.9

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20162.9
- Microsoft.NET.Sdk - 5.0.100-preview.3.20162.9

* Update dependencies from https://github.com/dotnet/sdk build 20200313.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20163.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20163.1

* Update dependencies from https://github.com/dotnet/sdk build 20200313.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20163.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20163.2

* Update dependencies from https://github.com/dotnet/sdk build 20200313.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20163.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20163.3

* Update dependencies from https://github.com/dotnet/sdk build 20200315.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20165.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20165.1

* Update dependencies from https://github.com/dotnet/sdk build 20200315.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20165.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20165.3

* Update dependencies from https://github.com/dotnet/sdk build 20200317.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20167.2

* Update dependencies from https://github.com/dotnet/sdk build 20200317.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20167.3

* Update dependencies from https://github.com/dotnet/sdk build 20200317.5

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.5
- Microsoft.NET.Sdk - 5.0.100-preview.3.20167.5

* Update dependencies from https://github.com/dotnet/sdk build 20200317.8

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20167.8
- Microsoft.NET.Sdk - 5.0.100-preview.3.20167.8

* Update dependencies from https://github.com/dotnet/sdk build 20200318.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.1

* Update dependencies from https://github.com/dotnet/sdk build 20200318.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.2

* Update dependencies from https://github.com/dotnet/sdk build 20200318.6

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.6
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.6

* Update dependencies from https://github.com/dotnet/sdk build 20200318.7

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.7
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.7

* Update dependencies from https://github.com/dotnet/sdk build 20200318.8

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.8
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.8

* Update dependencies from https://github.com/dotnet/sdk build 20200318.9

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.9
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.9

* Update dependencies from https://github.com/dotnet/sdk build 20200318.10

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20168.10
- Microsoft.NET.Sdk - 5.0.100-preview.3.20168.10

* Update dependencies from https://github.com/dotnet/sdk build 20200319.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20169.1

* Update dependencies from https://github.com/dotnet/sdk build 20200319.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20169.2

* Update dependencies from https://github.com/dotnet/sdk build 20200319.3

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.3
- Microsoft.NET.Sdk - 5.0.100-preview.3.20169.3

* Update dependencies from https://github.com/dotnet/sdk build 20200319.4

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20169.4
- Microsoft.NET.Sdk - 5.0.100-preview.3.20169.4

* Update dependencies from https://github.com/dotnet/sdk build 20200320.1

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20170.1
- Microsoft.NET.Sdk - 5.0.100-preview.3.20170.1

* Partially reordered paths passed to crossgen

* Update dependencies from https://github.com/dotnet/sdk build 20200320.2

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.3.20170.2
- Microsoft.NET.Sdk - 5.0.100-preview.3.20170.2

* Partially reordered paths passed to crossgen

* Partially reordered paths passed to crossgen

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Bekir Ozturk <bozturk@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2020-03-20 21:42:20 +00:00 committed by GitHub
parent 7a265c390e
commit 02ee648fc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
eng/Version.Details.xml
View file

@ -75,13 +75,13 @@
<Uri>https://github.com/dotnet/templating</Uri> <Uri>https://github.com/dotnet/templating</Uri>
<Sha>c3f88f3471bb22c489784faf5a84e44263f4f994</Sha> <Sha>c3f88f3471bb22c489784faf5a84e44263f4f994</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.3.20160.12"> <Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.3.20170.2">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>cda04f124e3571e186ecc8f26958ceeaffb2a469</Sha> <Sha>ac7fd98a7b6f8e625aab8977029813bec6088e70</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-preview.3.20160.12"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-preview.3.20170.2">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>cda04f124e3571e186ecc8f26958ceeaffb2a469</Sha> <Sha>ac7fd98a7b6f8e625aab8977029813bec6088e70</Sha>
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-preview.3.20169.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-preview.3.20169.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

4
eng/Versions.props
View file

@ -49,8 +49,8 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk --> <!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>5.0.100-preview.3.20160.12</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>5.0.100-preview.3.20170.2</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.3.20160.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.3.20170.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup> </PropertyGroup>

8
src/redist/targets/Crossgen.targets
View file

@ -87,6 +87,14 @@
<!-- FSharp.Build.dll causes the FSharp folder to be included. Remove it, as we don't want other FSharp dlls being included in the crossgen. --> <!-- FSharp.Build.dll causes the FSharp folder to be included. Remove it, as we don't want other FSharp dlls being included in the crossgen. -->
<RemainingFolders Remove="$(PublishDir)FSharp\**\*" /> <RemainingFolders Remove="$(PublishDir)FSharp\**\*" />
<!-- RemainingFolders should be ordered so that dependencies are first looked up in the leaf folders.
Currently it is not ordered and crossgen is picking the wrong dlls when resolving dependencies: https://github.com/dotnet/core-sdk/pull/6774
As a partial solution, we remove the root folder from the list and put it back to the end.
Remove the following 2 lines when resolving this issue: https://github.com/dotnet/core-sdk/issues/6877 -->
<RemainingFolders Remove="$(SdkOutputDirectory.TrimEnd('\').TrimEnd('/'))" />
<RemainingFolders Include="$(SdkOutputDirectory.TrimEnd('\').TrimEnd('/'))" />
</ItemGroup> </ItemGroup>
<!-- Crossgen does not support generating symbols on Mac --> <!-- Crossgen does not support generating symbols on Mac -->