Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/sdk (#8129)
Browse files Browse the repository at this point in the history
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - dotnet-watch: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20407.1 to 5.0.0-rc.1.20407.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20370.3 to 5.0.0-rc.1.20417.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

- Updates:
  - Microsoft.DotNet.MSBuildSdkResolver: from 5.0.100-rc.1.20407.9 to 5.0.100-rc.1.20419.19
  - Microsoft.NET.Sdk: from 5.0.100-rc.1.20407.9 to 5.0.100-rc.1.20419.19
  - Microsoft.WindowsDesktop.App.Ref: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4
  - Microsoft.WindowsDesktop.App: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4
  - Microsoft.NETCore.App.Ref: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.App.Internal: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.App.Host.win-x64: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.DotNetHostResolver: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.NETCore.Platforms: from 5.0.0-rc.1.20404.16 to 5.0.0-rc.1.20417.14
  - Microsoft.AspNetCore.App.Ref: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - dotnet-dev-certs: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - dotnet-user-secrets: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - dotnet-watch: from 5.0.0-rc.1.20405.9 to 5.0.0-rc.1.20418.28
  - Microsoft.DotNet.Common.ItemTemplates: from 5.0.0-rc.1.20407.1 to 5.0.0-rc.1.20407.2
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.0-rc.1.20370.3 to 5.0.0-rc.1.20417.1
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.4
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.0-rc.1.20405.1 to 5.0.0-rc.1.20417.3

 - Address corssgen target issues

 - Merge branch 'darc-master-2e4e2d61-f78f-4bde-8947-ee1fee18e9a9' of https://github.com/dotnet/core-sdk into darc-master-2e4e2d61-f78f-4bde-8947-ee1fee18e9a9

 - Merge branch 'master' of https://github.com/dotnet/core-sdk into darc-master-2e4e2d61-f78f-4bde-8947-ee1fee18e9a9
  • Loading branch information
dotnet-maestro[bot] authored Aug 20, 2020
1 parent 27aca71 commit 8a22a19
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 62 deletions.
80 changes: 40 additions & 40 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-rc.1.20405.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-rc.1.20417.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>8be1ccd1047a7febcb347a18f4cc9f5b9e99cdd7</Sha>
<Sha>85186023c8de8237268033cadc41d738b7f2005e</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-rc.1.20405.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-rc.1.20417.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>8be1ccd1047a7febcb347a18f4cc9f5b9e99cdd7</Sha>
<Sha>85186023c8de8237268033cadc41d738b7f2005e</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-rc.1.20405.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-rc.1.20417.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>8be1ccd1047a7febcb347a18f4cc9f5b9e99cdd7</Sha>
<Sha>85186023c8de8237268033cadc41d738b7f2005e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.1.20404.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.1.20417.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
<Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-rc.1.20404.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-rc.1.20417.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
<Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20404.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20417.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
<Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.0-rc.1.20404.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.0-rc.1.20417.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
<Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-rc.1.20404.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.0-rc.1.20417.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
<Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-rc.1.20404.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-rc.1.20417.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b497143c168c8df00f070e95a4c6fee4092d2ea6</Sha>
<Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.1.20405.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.1.20418.28" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b052c4fcc200633443ccfedb0007e03b4b2340a8</Sha>
<Sha>4995bbf109d8c16faa6cc3dd8e8104f7b5f72008</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20405.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20418.28" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b052c4fcc200633443ccfedb0007e03b4b2340a8</Sha>
<Sha>4995bbf109d8c16faa6cc3dd8e8104f7b5f72008</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0" Version="5.0.0-rc.1.20405.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0" Version="5.0.0-rc.1.20418.28" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b052c4fcc200633443ccfedb0007e03b4b2340a8</Sha>
<Sha>4995bbf109d8c16faa6cc3dd8e8104f7b5f72008</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="5.0.0-rc.1.20405.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="5.0.0-rc.1.20418.28" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b052c4fcc200633443ccfedb0007e03b4b2340a8</Sha>
<Sha>4995bbf109d8c16faa6cc3dd8e8104f7b5f72008</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="5.0.0-rc.1.20405.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="5.0.0-rc.1.20418.28" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b052c4fcc200633443ccfedb0007e03b4b2340a8</Sha>
<Sha>4995bbf109d8c16faa6cc3dd8e8104f7b5f72008</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="5.0.0-rc.1.20405.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-watch" Version="5.0.0-rc.1.20418.28" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b052c4fcc200633443ccfedb0007e03b4b2340a8</Sha>
<Sha>4995bbf109d8c16faa6cc3dd8e8104f7b5f72008</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.20419.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
Expand All @@ -75,26 +75,26 @@
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>8ff52387853520863ad09a84b23c63ac5a471886</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-rc.1.20407.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-rc.1.20407.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>de8e4533a04456bf079a88866dedd98339cd768b</Sha>
<Sha>633dff0b4bc05682536941936379f4dff4531c7e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-rc.1.20407.9">
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-rc.1.20419.19">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>5550ac2fabb8bfae46d6a4de884bfbad71bbad99</Sha>
<Sha>5cb7e1f18108838001f96c5dd1292162861fc949</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-rc.1.20407.9">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-rc.1.20419.19">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>5550ac2fabb8bfae46d6a4de884bfbad71bbad99</Sha>
<Sha>5cb7e1f18108838001f96c5dd1292162861fc949</Sha>
</Dependency>
<!-- 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-rc.1.20370.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-rc.1.20417.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>5854f1b352559b04cc4969b0ea2241af517fcdfa</Sha>
<Sha>b014c89fafff342c92c27968f8231b5032b12954</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-rc.1.20405.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-rc.1.20417.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>973ffc6e2edf170124176e7ebf0a850bdc1b359f</Sha>
<Sha>b91ba697c48bc7825580e3c7fa09c5c3781c3788</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
40 changes: 20 additions & 20 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-rc.1.20370.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-rc.1.20417.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-rc.1.20405.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-rc.1.20417.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.0-rc.1.20407.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.0-rc.1.20407.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
Expand All @@ -41,41 +41,41 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20405.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>5.0.0-rc.1.20405.9</MicrosoftAspNetCoreAppRefPackageVersion>
<VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>5.0.0-rc.1.20405.9</VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>
<dotnetdevcertsPackageVersion>5.0.0-rc.1.20405.9</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>5.0.0-rc.1.20405.9</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>5.0.0-rc.1.20405.9</dotnetwatchPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20418.28</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>5.0.0-rc.1.20418.28</MicrosoftAspNetCoreAppRefPackageVersion>
<VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>5.0.0-rc.1.20418.28</VSRedistCommonAspNetCoreTargetingPackx6450PackageVersion>
<dotnetdevcertsPackageVersion>5.0.0-rc.1.20418.28</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>5.0.0-rc.1.20418.28</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>5.0.0-rc.1.20418.28</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>5.0.100-rc.1.20407.9</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-rc.1.20407.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>5.0.100-rc.1.20419.19</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-rc.1.20419.19</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-rc.1.20404.16</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.1.20404.16</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20404.16</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.0-rc.1.20404.16</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.1.20404.16</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-rc.1.20404.16</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.1.20417.14</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20417.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.0-rc.1.20417.14</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.1.20417.14</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.0-rc.1.20417.14</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-rc.1.20405.1</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-rc.1.20405.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-rc.1.20405.1</MicrosoftWindowsDesktopAppRefPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-rc.1.20417.4</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-rc.1.20417.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-rc.1.20417.4</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
Expand Down
8 changes: 6 additions & 2 deletions src/redist/targets/Crossgen.targets
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@

<ItemGroup>
<RoslynFiles Include="$(SdkOutputDirectory)Roslyn\bincore\**\*" />
<FSharpFiles Include="$(SdkOutputDirectory)FSharp\**\*" Exclude="$(SdkOutputDirectory)FSharp\FSharp.Build.dll" />
<RemainingFiles Include="$(SdkOutputDirectory)**\*" Exclude="@(RoslynFiles);@(FSharpFiles)" />

<FSharpFilesRuntimes Include="$(SdkOutputDirectory)FSharp\runtimes\**\*" />
<FSharpFilesRoot Include="$(SdkOutputDirectory)FSharp\**\*" Exclude="$(SdkOutputDirectory)FSharp\FSharp.Build.dll;@(FSharpFilesRuntimes)" />
<FSharpFiles Include="@(FSharpFilesRuntimes);@(FSharpFilesRoot)" />

<RemainingFiles Include="$(SdkOutputDirectory)**\*" Exclude="$(SdkOutputDirectory)FSharp\FSharp.Build.dll;@(RoslynFiles);@(FSharpFiles)" />

<!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
<RemainingFiles Remove="$(SdkOutputDirectory)TestHost*\**\*" />
Expand Down

0 comments on commit 8a22a19

Please sign in to comment.