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

[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-preview.6.23304.1 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-preview.6.23304.1 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-preview.6.23304.1 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.6.23306.10 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-preview.6.23306.10 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.6.23306.10 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.6.23306.10 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.6.23306.10 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-preview.6.23306.10 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.6.23307.1 to 8.0.0-preview.6.23307.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.6.23307.1 to 8.0.0-preview.6.23307.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.6.23307.1 to 8.0.0-preview.6.23307.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.6.23307.1 to 8.0.0-preview.6.23307.4 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-preview.6.23307.1 to 8.0.0-preview.6.23307.4 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-preview.6.23307.1 to 8.0.0-preview.6.23307.4 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-preview.6.23307.1 to 8.0.0-preview.6.23307.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.6.23304.1 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-preview.6.23303.1 to 8.0.0-preview.6.23306.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-preview.6.23304.1 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-preview.6.23303.2 to 8.0.0-preview.6.23307.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.Test.Sdk: from 17.7.0-preview.23302.1 to 17.7.0-preview.23307.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.6.23306.10 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.7.0-preview-23306-05 to 17.7.0-preview-23307-02 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.7.0-preview.2.51 to 6.7.0-preview.3.57 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.6.23306.10 to 8.0.0-preview.6.23307.1 (parent: Microsoft.NET.Sdk)

 - Remove backported source-build patch
This commit is contained in:
dotnet-maestro[bot] 2023-06-07 22:02:33 +00:00 committed by GitHub
parent 3e04392537
commit b06809a7ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 81 additions and 169 deletions

View file

@ -1,46 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-preview.6.23304.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>42db79719e2f4242c06197c39793ad183c7b3bad</Sha>
<Sha>1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23304.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>42db79719e2f4242c06197c39793ad183c7b3bad</Sha>
<Sha>1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23304.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>42db79719e2f4242c06197c39793ad183c7b3bad</Sha>
<Sha>1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.6.23304.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>42db79719e2f4242c06197c39793ad183c7b3bad</Sha>
<Sha>1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
<Sha>6e34b5d4e9b16321f37c108fea3aa7e4e04b495a</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
<Sha>6e34b5d4e9b16321f37c108fea3aa7e4e04b495a</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
<Sha>6e34b5d4e9b16321f37c108fea3aa7e4e04b495a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
<Sha>6e34b5d4e9b16321f37c108fea3aa7e4e04b495a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
<Sha>6e34b5d4e9b16321f37c108fea3aa7e4e04b495a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
<Sha>6e34b5d4e9b16321f37c108fea3aa7e4e04b495a</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. -->
@ -48,38 +48,38 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
<Sha>6e34b5d4e9b16321f37c108fea3aa7e4e04b495a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3863fdbb7747db80c829f22a7369d8efd295c9ff</Sha>
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -102,31 +102,31 @@
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>98b55256c6cdfc0ed98c52d7d39127fa55971330</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.6.23307.9">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.6.23307.17">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>9d31222d665cd38a3b9ede679b1858785771e32f</Sha>
<Sha>6c816a360f060a8d2c1822d812033d27fb2804ce</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.6.23307.9">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.6.23307.17">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>9d31222d665cd38a3b9ede679b1858785771e32f</Sha>
<Sha>6c816a360f060a8d2c1822d812033d27fb2804ce</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.6.23307.9">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.6.23307.17">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>9d31222d665cd38a3b9ede679b1858785771e32f</Sha>
<Sha>6c816a360f060a8d2c1822d812033d27fb2804ce</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.6.23307.9">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.6.23307.17">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>9d31222d665cd38a3b9ede679b1858785771e32f</Sha>
<Sha>6c816a360f060a8d2c1822d812033d27fb2804ce</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="8.0.0-preview.6.23303.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.6.23306.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>89fcc580afb06911254f00cfc6650b0496c033ad</Sha>
<Sha>7e85d02f5bbbf8535064a47f38eab63539c54e11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.0-preview.6.23303.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.0-preview.6.23307.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>644cb9355a14e39f8beb694ddc56daf46b2bcaec</Sha>
<Sha>927b58e4743a8fa2164c24a47cbd9853b435d605</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.0-beta.23305.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
@ -137,28 +137,28 @@
<Sha>b265c68604681242d3a83db3f0f7b1bb97db4b93</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23302.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>1fe03b9451e6605b0846fc544cc0effd2b39a85c</Sha>
<Sha>8381658bfb847e67b4f41a997411e8a804e1ecb4</Sha>
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.6.23306.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>20ca966b59c96ddbc8ce6b2c6f415d9c93f2c49a</Sha>
<Sha>6e34b5d4e9b16321f37c108fea3aa7e4e04b495a</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-3.23306.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>826e1770eedb6d8d44a054c9e3ea6569e7ec5970</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23306-05" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23307-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>53a92930247b9bd023a24b57f778dfe9a969b693</Sha>
<Sha>a6a0ee16b7d202186a6c44f1c5aebe30ddc63ab2</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.2.51" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.3.57" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>f3bb337e310ce44abda4ad73cdb0755ed940809d</Sha>
<Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">

View file

@ -44,11 +44,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.6.23303.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.6.23306.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.6.23303.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.6.23307.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
@ -68,22 +68,22 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23307.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.6.23307.1</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.6.23307.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23307.1</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
<dotnetdevcertsPackageVersion>8.0.0-preview.6.23307.1</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>8.0.0-preview.6.23307.1</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>8.0.0-preview.6.23307.1</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23307.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.6.23307.4</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.6.23307.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23307.4</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
<dotnetdevcertsPackageVersion>8.0.0-preview.6.23307.4</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>8.0.0-preview.6.23307.4</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>8.0.0-preview.6.23307.4</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.6.23307.9</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.6.23307.9</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.6.23307.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.6.23307.17</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.6.23307.17</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.6.23307.17</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -94,24 +94,24 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.6.23306.10</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.6.23307.1</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23306.10</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.6.23306.10</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23306.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.6.23306.10</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23306.10</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.6.23306.10</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23307.1</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.6.23307.1</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23307.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.6.23307.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23307.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.6.23307.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23304.1</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.6.23304.1</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.6.23304.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.6.23304.1</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23307.1</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.6.23307.1</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.6.23307.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.6.23307.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
@ -123,7 +123,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
<NuGetBuildTasksPackageVersion>6.7.0-preview.2.51</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackageVersion>6.7.0-preview.3.57</NuGetBuildTasksPackageVersion>
</PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
<PropertyGroup>
@ -225,7 +225,7 @@
<PropertyGroup>
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.7.0-preview.23302.1</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.7.0-preview.23307.1</MicrosoftNETTestSdkVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-alpha.1.22557.12</MicrosoftExtensionsLoggingConsoleVersion>
</PropertyGroup>
<!-- Workload manifest package versions -->

View file

@ -1,88 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Tue, 23 May 2023 16:04:38 -0500
Subject: [PATCH] Exclude WPF projects from source-build
Backport: https://github.com/NuGet/NuGet.Client/pull/5180
---
Directory.Build.targets | 1 +
...FromSourceBuild.AfterCommonTargets.targets | 21 +++++++++++++++++++
eng/source-build/Noop.proj | 6 ++++++
.../NuGet.Console/NuGet.Console.csproj | 1 +
.../NuGet.PackageManagement.UI.csproj | 1 +
5 files changed, 30 insertions(+)
create mode 100644 eng/source-build/ExcludeFromSourceBuild.AfterCommonTargets.targets
create mode 100644 eng/source-build/Noop.proj
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 04e2d5b14..06c729a21 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,3 +1,4 @@
<Project>
<Import Project="build\common.targets" Condition="'$(IsCrossTargetingBuild)' == 'true' And '$(_WasCommonPropsImported)' != 'true'" />
+ <Import Project="eng\source-build\ExcludeFromSourceBuild.AfterCommonTargets.targets" Condition="'$(DotNetBuildFromSource)' == 'true'" />
</Project>
diff --git a/eng/source-build/ExcludeFromSourceBuild.AfterCommonTargets.targets b/eng/source-build/ExcludeFromSourceBuild.AfterCommonTargets.targets
new file mode 100644
index 000000000..e5a428fef
--- /dev/null
+++ b/eng/source-build/ExcludeFromSourceBuild.AfterCommonTargets.targets
@@ -0,0 +1,21 @@
+<Project>
+ <!--
+ If a project specifies ExcludeFromSourceBuild=true during a source build suppress all targets and emulate a no-op
+ (empty common targets like Restore, Build, Pack, etc.).
+ Inspired by https://github.com/dotnet/arcade/blob/d9275ca3f692b5f97702bb6717a3bf78afedbf38/src/Microsoft.DotNet.Arcade.Sdk/tools/ExcludeFromBuild.BeforeCommonTargets.targets
+ -->
+ <PropertyGroup>
+ <_SuppressAllTargets>false</_SuppressAllTargets>
+ <_SuppressAllTargets Condition="'$(DotNetBuildFromSource)' == 'true' and '$(ExcludeFromSourceBuild)' == 'true'">true</_SuppressAllTargets>
+ <!-- If excluding, then disable a restore warning, which will fire on newer SDKs, as well as set the NuGetRestoreTargets property to empty,
+ which will avoid importing the restore targets inside the .NET SDK. If the restore targets exist, then static graph restore will attempt tpo
+ execute. -->
+ <DisableWarnForInvalidRestoreProjects Condition="'$(_SuppressAllTargets)' == 'true'">true</DisableWarnForInvalidRestoreProjects>
+ <NuGetRestoreTargets Condition="'$(_SuppressAllTargets)' == 'true'">$(MSBuildThisFileDirectory)NoRestore.targets</NuGetRestoreTargets>
+ <!-- When a project is using the .NET SDK, but with the "UseWpf" property, there will be an attempt to import the windows desktop SDK targets.
+ These are not available in certain circumstances, like linux source build. -->
+ <ImportWindowsDesktopTargets Condition="'$(_SuppressAllTargets)' == 'true'">false</ImportWindowsDesktopTargets>
+ </PropertyGroup>
+
+ <Import Project="Noop.proj" Condition="'$(_SuppressAllTargets)' == 'true'" />
+</Project>
diff --git a/eng/source-build/Noop.proj b/eng/source-build/Noop.proj
new file mode 100644
index 000000000..baededa3b
--- /dev/null
+++ b/eng/source-build/Noop.proj
@@ -0,0 +1,6 @@
+<Project>
+ <Target Name="Restore" />
+ <Target Name="Build" />
+ <Target Name="Pack" />
+ <Target Name="Test" />
+</Project>
diff --git a/src/NuGet.Clients/NuGet.Console/NuGet.Console.csproj b/src/NuGet.Clients/NuGet.Console/NuGet.Console.csproj
index 0b467d504..285a6bebe 100644
--- a/src/NuGet.Clients/NuGet.Console/NuGet.Console.csproj
+++ b/src/NuGet.Clients/NuGet.Console/NuGet.Console.csproj
@@ -8,6 +8,7 @@
<Description>Package Manager PowerShell Console implementation.</Description>
<TargetFramework>$(NETFXTargetFramework)</TargetFramework>
<UseWpf>true</UseWpf>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup>
<ItemGroup>
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj b/src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj
index df19b4641..066d338b5 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj
@@ -11,6 +11,7 @@
<UseWinForms>true</UseWinForms>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>$(NETFXTargetFramework)</TargetFramework>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup>
<ItemGroup>