[main] Update dependencies from dotnet/sdk (#16621)
This commit is contained in:
Marc Paine
GitHub
commit
b643eed968
10 changed files with 102 additions and 665 deletions
|
|
@ -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.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-preview.6.23314.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423</Sha>
|
||||
<Sha>c32d6fc5793f1788d7f366d19adcfb1be377f2ba</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23314.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423</Sha>
|
||||
<Sha>c32d6fc5793f1788d7f366d19adcfb1be377f2ba</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23314.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423</Sha>
|
||||
<Sha>c32d6fc5793f1788d7f366d19adcfb1be377f2ba</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.6.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.6.23314.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>1cd1ad8fe680d4d38f0bcc839ad1392e0c4ba423</Sha>
|
||||
<Sha>c32d6fc5793f1788d7f366d19adcfb1be377f2ba</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23314.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>54dab738de58291ebefc8ff0569a799efaff5d82</Sha>
|
||||
<Sha>0a0fa137097595ad8ec0e2aa9ecffb524cd5df95</Sha>
|
||||
<SourceBuild RepoName="runtime" ManagedOnly="false" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.6.23314.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>54dab738de58291ebefc8ff0569a799efaff5d82</Sha>
|
||||
<Sha>0a0fa137097595ad8ec0e2aa9ecffb524cd5df95</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.6.23314.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>54dab738de58291ebefc8ff0569a799efaff5d82</Sha>
|
||||
<Sha>0a0fa137097595ad8ec0e2aa9ecffb524cd5df95</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23314.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>54dab738de58291ebefc8ff0569a799efaff5d82</Sha>
|
||||
<Sha>0a0fa137097595ad8ec0e2aa9ecffb524cd5df95</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.6.23314.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>54dab738de58291ebefc8ff0569a799efaff5d82</Sha>
|
||||
<Sha>0a0fa137097595ad8ec0e2aa9ecffb524cd5df95</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.6.23314.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>54dab738de58291ebefc8ff0569a799efaff5d82</Sha>
|
||||
<Sha>0a0fa137097595ad8ec0e2aa9ecffb524cd5df95</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.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.6.23314.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>54dab738de58291ebefc8ff0569a799efaff5d82</Sha>
|
||||
<Sha>0a0fa137097595ad8ec0e2aa9ecffb524cd5df95</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.6.23313.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
|
||||
<Sha>62b68b5584c88427c93bd78cac9723439f387234</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.6.23313.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
|
||||
<Sha>62b68b5584c88427c93bd78cac9723439f387234</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23313.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
|
||||
<Sha>62b68b5584c88427c93bd78cac9723439f387234</Sha>
|
||||
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.6.23313.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
|
||||
<Sha>62b68b5584c88427c93bd78cac9723439f387234</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.6.23313.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
|
||||
<Sha>62b68b5584c88427c93bd78cac9723439f387234</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.6.23313.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
|
||||
<Sha>62b68b5584c88427c93bd78cac9723439f387234</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.6.23313.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
|
||||
<Sha>62b68b5584c88427c93bd78cac9723439f387234</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,72 +102,72 @@
|
|||
<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.24">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.6.23315.14">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>6ce52a339247f9a848ff97fa418070b65de92b4d</Sha>
|
||||
<Sha>1a17b18064c9bbf7dcb2155a03f2c92fe657fba1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.6.23307.24">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.6.23315.14">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>6ce52a339247f9a848ff97fa418070b65de92b4d</Sha>
|
||||
<Sha>1a17b18064c9bbf7dcb2155a03f2c92fe657fba1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.6.23307.24">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.6.23315.14">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>6ce52a339247f9a848ff97fa418070b65de92b4d</Sha>
|
||||
<Sha>1a17b18064c9bbf7dcb2155a03f2c92fe657fba1</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.6.23307.24">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.6.23315.14">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>6ce52a339247f9a848ff97fa418070b65de92b4d</Sha>
|
||||
<Sha>1a17b18064c9bbf7dcb2155a03f2c92fe657fba1</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.23306.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.6.23313.13" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>7e85d02f5bbbf8535064a47f38eab63539c54e11</Sha>
|
||||
<Sha>0cc57e403de2bb076ad290742e1425b669884ff9</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.0-preview.6.23307.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.0-preview.6.23314.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>927b58e4743a8fa2164c24a47cbd9853b435d605</Sha>
|
||||
<Sha>86fa6c6e01d0397d6289906625888e2ea3103f63</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.0-beta.23305.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.0-beta.23313.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>b265c68604681242d3a83db3f0f7b1bb97db4b93</Sha>
|
||||
<Sha>21d16660279e91cdcc5f523b536dcc67a87294f6</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.100-beta.23305.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.100-beta.23313.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>b265c68604681242d3a83db3f0f7b1bb97db4b93</Sha>
|
||||
<Sha>21d16660279e91cdcc5f523b536dcc67a87294f6</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23307.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview-23313-04" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>8381658bfb847e67b4f41a997411e8a804e1ecb4</Sha>
|
||||
<Sha>a006b59a7af55448b69ea835f0037437f363c25f</Sha>
|
||||
<SourceBuild RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.6.23307.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.6.23314.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>54dab738de58291ebefc8ff0569a799efaff5d82</Sha>
|
||||
<Sha>0a0fa137097595ad8ec0e2aa9ecffb524cd5df95</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-3.23306.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-3.23315.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>826e1770eedb6d8d44a054c9e3ea6569e7ec5970</Sha>
|
||||
<Sha>7a7690eaf161de8dd7b603aa612f9f7ab8683796</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23307-02" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23312-02" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>a6a0ee16b7d202186a6c44f1c5aebe30ddc63ab2</Sha>
|
||||
<Sha>df97a4b69224643b4af407f41b33f8c9762af3c0</Sha>
|
||||
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.3.57" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.3.77" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
<Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
<Sha>288a4790bfbf856a4e847ec9cc342b6d1d57f3c3</Sha>
|
||||
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
||||
<Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
|
||||
<Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.6.23301.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.6.23312.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>63af043d58bd8d471da0e236e6255611e061cc4e</Sha>
|
||||
<Sha>1640faa87e2e7656bf20dfe38eb8ea3cc3b9e806</Sha>
|
||||
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview.6.23206.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.6.23306.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.0-preview.6.23313.13</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.6.23307.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.0-preview.6.23314.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -68,50 +68,50 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<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>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23313.26</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.6.23313.26</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.6.23313.26</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23313.26</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>8.0.0-preview.6.23313.26</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>8.0.0-preview.6.23313.26</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>8.0.0-preview.6.23313.26</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.6.23307.24</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.100-preview.6.23307.24</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.6.23307.24</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.6.23315.14</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.100-preview.6.23315.14</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.6.23315.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-3.23306.1</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-3.23315.1</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.6.23307.4</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.6.23314.14</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23307.4</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.6.23307.4</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23307.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.6.23307.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23307.4</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.6.23307.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23314.14</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.6.23314.14</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.6.23314.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.6.23314.14</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.6.23314.14</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.6.23314.14</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<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>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.0-preview.6.23314.9</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.0-preview.6.23314.9</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.0-preview.6.23314.9</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.0-preview.6.23314.9</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.3.57</NuGetBuildTasksPackageVersion>
|
||||
<NuGetBuildTasksPackageVersion>6.7.0-preview.3.77</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.23307.1</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.7.0-preview-23313-04</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-alpha.1.22557.12</MicrosoftExtensionsLoggingConsoleVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Workload manifest package versions -->
|
||||
|
|
@ -238,7 +238,7 @@
|
|||
<XamarinMacOSWorkloadManifestVersion>13.1.462-net8-p3</XamarinMacOSWorkloadManifestVersion>
|
||||
<XamarinTvOSWorkloadManifestVersion>16.1.1250-net8-p3</XamarinTvOSWorkloadManifestVersion>
|
||||
<!-- Workloads from dotnet/emsdk -->
|
||||
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-preview.6.23301.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-preview.6.23312.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
|
||||
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
|
||||
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
|
||||
<EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
|
||||
|
|
|
|||
|
|
@ -29,10 +29,16 @@ public class WebScenarioTests : SmokeTests
|
|||
foreach (DotNetLanguage language in new[] { DotNetLanguage.CSharp, DotNetLanguage.FSharp })
|
||||
{
|
||||
yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Web, DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex);
|
||||
yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true };
|
||||
// TODO: Re-enable once https://github.com/dotnet/runtime/pull/87518 flows to the public feeds. Note, the smoke-tests pull Microsoft.Extensions.DependencyModel
|
||||
// from a public feed - not a source build feed.
|
||||
//yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true };
|
||||
yield return new(nameof(WebScenarioTests), language, DotNetTemplate.WebApi, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish);
|
||||
}
|
||||
|
||||
// TODO: Remove once https://github.com/dotnet/runtime/pull/87518 flows to the public feeds. Note, the smoke-tests pull Microsoft.Extensions.DependencyModel
|
||||
// from a public feed - not a source build feed.
|
||||
yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true };
|
||||
|
||||
yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Razor, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish);
|
||||
yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish);
|
||||
yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorServer, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish);
|
||||
|
|
|
|||
|
|
@ -1,96 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Wed, 31 May 2023 16:04:51 +0000
|
||||
Subject: [PATCH] Target net8.0 for source-build
|
||||
|
||||
Backport: https://github.com/NuGet/NuGet.Client/pull/5193
|
||||
---
|
||||
build/common.project.props | 8 ++++----
|
||||
build/common.targets | 2 +-
|
||||
eng/source-build/global.json | 2 +-
|
||||
.../NuGet.Configuration/NuGet.Configuration.csproj | 2 +-
|
||||
.../NuGet.PackageManagement.csproj | 2 +-
|
||||
5 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/build/common.project.props b/build/common.project.props
|
||||
index 0e32eb737..de8b07140 100644
|
||||
--- a/build/common.project.props
|
||||
+++ b/build/common.project.props
|
||||
@@ -12,7 +12,7 @@
|
||||
<NETFXTargetFrameworkVersion>v4.7.2</NETFXTargetFrameworkVersion>
|
||||
<NETFXTargetFramework>net472</NETFXTargetFramework>
|
||||
<NETCoreTargetFramework>netcoreapp3.1</NETCoreTargetFramework>
|
||||
- <NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net7.0</NETCoreTargetFramework>
|
||||
+ <NETCoreTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0</NETCoreTargetFramework>
|
||||
<NETCoreTestTargetFrameworks>net7.0</NETCoreTestTargetFrameworks>
|
||||
<NETCoreTestTargetFrameworks Condition=" ('$(CI)' == 'true' AND '$(BUILD_NET8)' != 'false') OR '$(BUILD_NET8)' == 'true' ">net7.0;net8.0</NETCoreTestTargetFrameworks>
|
||||
<NetStandardVersion>netstandard2.0</NetStandardVersion>
|
||||
@@ -20,14 +20,14 @@
|
||||
<TargetFrameworksExe Condition="'$(IsXPlat)' == 'true'">$(NETCoreTargetFramework)</TargetFrameworksExe>
|
||||
<TargetFrameworksExeForSigning>$(TargetFrameworksExe);netcoreapp5.0</TargetFrameworksExeForSigning>
|
||||
<TargetFrameworksExeForSigning Condition=" '$(IsXPlat)' == 'true' ">$(NETCoreTargetFramework);netcoreapp5.0</TargetFrameworksExeForSigning>
|
||||
- <TargetFrameworksExeForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksExe);net7.0</TargetFrameworksExeForSigning>
|
||||
+ <TargetFrameworksExeForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksExe)</TargetFrameworksExeForSigning>
|
||||
<MinimalTargetFrameworksExeSigning>$(NETFXTargetFramework);netcoreapp5.0</MinimalTargetFrameworksExeSigning>
|
||||
<MinimalTargetFrameworksExeSigning Condition=" '$(IsXPlat)' == 'true' ">netcoreapp5.0</MinimalTargetFrameworksExeSigning>
|
||||
- <MinimalTargetFrameworksExeSigning Condition="'$(DotNetBuildFromSource)' == 'true'">net7.0</MinimalTargetFrameworksExeSigning>
|
||||
+ <MinimalTargetFrameworksExeSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(NETCoreTargetFramework)</MinimalTargetFrameworksExeSigning>
|
||||
<TargetFrameworksLibrary>$(NETFXTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
|
||||
<TargetFrameworksLibrary Condition="'$(DotNetBuildFromSource)' == 'true'">$(NETCoreTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
|
||||
<TargetFrameworksLibraryForSigning>$(TargetFrameworksLibrary);netcoreapp5.0</TargetFrameworksLibraryForSigning>
|
||||
- <TargetFrameworksLibraryForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksLibrary);net7.0</TargetFrameworksLibraryForSigning>
|
||||
+ <TargetFrameworksLibraryForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksLibrary)</TargetFrameworksLibraryForSigning>
|
||||
<TargetFrameworksLibraryForCrossVerificationTests>$(NETFXTargetFramework);$(NETCoreTestTargetFrameworks)</TargetFrameworksLibraryForCrossVerificationTests>
|
||||
<RepositoryRootDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\</RepositoryRootDirectory>
|
||||
<BuildCommonDirectory>$(RepositoryRootDirectory)build\</BuildCommonDirectory>
|
||||
diff --git a/build/common.targets b/build/common.targets
|
||||
index 51b38ba04..dc53d7557 100644
|
||||
--- a/build/common.targets
|
||||
+++ b/build/common.targets
|
||||
@@ -6,7 +6,7 @@
|
||||
<IsDesktop>true</IsDesktop>
|
||||
</PropertyGroup>
|
||||
|
||||
- <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) OR $(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('net6')) OR $(TargetFramework.StartsWith('net7')) ">
|
||||
+ <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp')) OR $(TargetFramework.StartsWith('netstandard')) OR $(TargetFramework.StartsWith('net6')) OR $(TargetFramework.StartsWith('net7')) OR $(TargetFramework.StartsWith('net8')) ">
|
||||
<DefineConstants>$(DefineConstants);IS_CORECLR</DefineConstants>
|
||||
<IsCore>true</IsCore>
|
||||
</PropertyGroup>
|
||||
diff --git a/eng/source-build/global.json b/eng/source-build/global.json
|
||||
index ba3ce2cfc..43d452859 100644
|
||||
--- a/eng/source-build/global.json
|
||||
+++ b/eng/source-build/global.json
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"tools": {
|
||||
- "dotnet": "7.0.100"
|
||||
+ "dotnet": "8.0.100-preview.3.23178.7"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21309.7"
|
||||
diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
|
||||
index a246feeb9..eea152eb6 100644
|
||||
--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
|
||||
+++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
|
||||
@@ -26,7 +26,7 @@
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
</ItemGroup>
|
||||
|
||||
- <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net7.0' ">
|
||||
+ <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0' ">
|
||||
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
|
||||
</ItemGroup>
|
||||
|
||||
diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
|
||||
index be1727a5b..38658b221 100644
|
||||
--- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
|
||||
+++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
|
||||
@@ -32,7 +32,7 @@
|
||||
<Reference Include="System.Net.Http" />
|
||||
</ItemGroup>
|
||||
|
||||
- <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net7.0' ">
|
||||
+ <ItemGroup Condition=" '$(TargetFramework)' == '$(NetStandardVersion)' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0' ">
|
||||
<PackageReference Include="System.ComponentModel.Composition" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Wed, 7 Jun 2023 03:03:22 +0000
|
||||
Subject: [PATCH] Add dependencies for PVP flow
|
||||
|
||||
Backport: https://github.com/NuGet/NuGet.Client/pull/5207
|
||||
---
|
||||
eng/Version.Details.xml | 27 +++++++++++++++++++++++++++
|
||||
1 file changed, 27 insertions(+)
|
||||
|
||||
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
|
||||
index ff6bc71b5..bbadad4c0 100644
|
||||
--- a/eng/Version.Details.xml
|
||||
+++ b/eng/Version.Details.xml
|
||||
@@ -5,4 +5,31 @@
|
||||
See https://github.com/dotnet/arcade/issues/2396 for details.
|
||||
See https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#details-file for schema.
|
||||
-->
|
||||
+
|
||||
+ <!--
|
||||
+ Following dependencies are required for PVP flow.
|
||||
+ PVP flow infra will automatically bump the version to the latest live one.
|
||||
+ -->
|
||||
+ <ProductDependencies>
|
||||
+ <Dependency Name="Microsoft.Build" Version="17.3.1">
|
||||
+ <Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
+ <Sha>80f618ad45d38475773fd1a6eaa059f118a0ad5a</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0">
|
||||
+ <Uri>https://github.com/dotnet/runtime</Uri>
|
||||
+ <Sha>8470979eb44c2218025515234d3e01138bd74afb</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0">
|
||||
+ <Uri>https://github.com/dotnet/runtime</Uri>
|
||||
+ <Sha>8470979eb44c2218025515234d3e01138bd74afb</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="Microsoft.Web.Xdt" Version="3.0.0">
|
||||
+ <Uri>https://github.com/aspnet/xdt</Uri>
|
||||
+ <Sha>d4d088b6a9c793525b1a27a119cb66ba4587bb39</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="System.ComponentModel.Composition" Version="4.5.0">
|
||||
+ <Uri>https://github.com/dotnet/corefx</Uri>
|
||||
+ <Sha>30ab651fcb4354552bd4891619a0bdd81e0ebdbf</Sha>
|
||||
+ </Dependency>
|
||||
+ </ProductDependencies>
|
||||
</Dependencies>
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,229 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Erhardt <eric.erhardt@microsoft.com>
|
||||
Date: Tue, 19 Oct 2021 11:12:25 -0500
|
||||
Subject: [PATCH] Eliminate pre-built assets during source-build for
|
||||
roslyn-analyzers
|
||||
|
||||
This is taking the approach used in previous versions of source-build: update the dependency versions of Microsoft.CodeAnalysis to the version currently being built by source-build. This is a short-term solution to get unblocked in the 6.0.0 timeframe. In the future, the previous Microsoft.CodeAnalysis versions will be available in SBRP.
|
||||
|
||||
* Remove SourceBuildPackageVersionPropsPath at the top of Versions.props. The PVP from source-build will be imported after the repo's Versions.props
|
||||
* Workaround naming collisions with DocumentBasedFixAllProvider. The latest Roslyn has a class with the same name.
|
||||
* Remove hard-coded versions to Microsoft.CodeAnalysis in ResxSourceGenerator, Roslyn.Diagnostics.Analyzers, and GenerateDocumentationAndConfigFiles, so the latest gets picked up.
|
||||
* Exclude ReleaseNotesUtil from source-build since it brings in the 3.1 app host. This tool shouldn't be needed during source-build.
|
||||
* Disable BannedApiAnalyzers when in source-build. Other previously built code analysis packages are disabled already.
|
||||
|
||||
Contributes to https://github.com/dotnet/source-build/issues/2420
|
||||
Contributes to https://github.com/dotnet/source-build/issues/2527
|
||||
|
||||
Backport: https://github.com/dotnet/source-build/issues/3049
|
||||
---
|
||||
eng/Versions.props | 14 --------------
|
||||
src/Directory.Build.targets | 5 +++--
|
||||
.../Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs | 2 +-
|
||||
....CodeAnalysis.ResxSourceGenerator.CSharp.csproj | 1 -
|
||||
...Analysis.ResxSourceGenerator.VisualBasic.csproj | 1 -
|
||||
...crosoft.CodeAnalysis.ResxSourceGenerator.csproj | 1 -
|
||||
...harpDisableRuntimeMarshalling.FixAllProvider.cs | 2 +-
|
||||
.../DoNotDirectlyAwaitATask.Fixer.cs | 2 +-
|
||||
.../Roslyn.Diagnostics.CSharp.Analyzers.csproj | 2 +-
|
||||
.../Core/Roslyn.Diagnostics.Analyzers.csproj | 1 -
|
||||
...Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj | 2 +-
|
||||
.../GenerateDocumentationAndConfigFiles.csproj | 1 -
|
||||
...umentationAndConfigFilesForBrokenRuntime.csproj | 4 +---
|
||||
src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj | 1 +
|
||||
.../Runtime/UseExceptionThrowHelpersFixer.cs | 2 +-
|
||||
15 files changed, 11 insertions(+), 30 deletions(-)
|
||||
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index a467fb579..acd5db8bc 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -1,18 +1,4 @@
|
||||
<Project>
|
||||
- <Import Project="$(SourceBuildPackageVersionPropsPath)" Condition="'$(SourceBuildPackageVersionPropsPath)' != ''" />
|
||||
- <PropertyGroup>
|
||||
- <!--
|
||||
- Binaries that need to be executable during source build are restricted to versions available within source build.
|
||||
- This section defines executable versions of packages which are referenced via lower-version reference assemblies
|
||||
- during the build.
|
||||
- -->
|
||||
- <SystemCollectionsImmutableExecutableVersion>$(SystemCollectionsImmutableVersion)</SystemCollectionsImmutableExecutableVersion>
|
||||
- <SystemCollectionsImmutableExecutableVersion Condition="'$(SystemCollectionsImmutableExecutableVersion)' == ''">5.0.0</SystemCollectionsImmutableExecutableVersion>
|
||||
- <SystemReflectionMetadataExecutableVersion>$(SystemReflectionMetadataVersion)</SystemReflectionMetadataExecutableVersion>
|
||||
- <SystemReflectionMetadataExecutableVersion Condition="'$(SystemReflectionMetadataExecutableVersion)' == ''">5.0.0</SystemReflectionMetadataExecutableVersion>
|
||||
- <MicrosoftCodeAnalysisExecutableVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisExecutableVersion>
|
||||
- <MicrosoftCodeAnalysisExecutableVersion Condition="'$(MicrosoftCodeAnalysisExecutableVersion)' == ''">3.8.0</MicrosoftCodeAnalysisExecutableVersion>
|
||||
- </PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<VersionPrefix>3.3.5</VersionPrefix>
|
||||
<PreReleaseVersionLabel>beta1</PreReleaseVersionLabel>
|
||||
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
|
||||
index c7c28fd9f..e5be9e028 100644
|
||||
--- a/src/Directory.Build.targets
|
||||
+++ b/src/Directory.Build.targets
|
||||
@@ -35,8 +35,9 @@
|
||||
<Link>AnalyzerReleases\$(AssemblyName)\AnalyzerReleases.Shipped.md</Link>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
-
|
||||
- <ItemGroup>
|
||||
+
|
||||
+ <!-- Disable code analysis for source build -->
|
||||
+ <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
|
||||
<AdditionalFiles Include="$(MSBuildThisFileDirectory)\BannedSymbols.txt" Condition="'$(BannedSymbolsOptOut)' != 'true'" />
|
||||
</ItemGroup>
|
||||
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs
|
||||
index 7a6877e0e..a0cbd06e7 100644
|
||||
--- a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs
|
||||
+++ b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/PreferIsKindFix.cs
|
||||
@@ -48,7 +48,7 @@ private async Task<Document> ConvertKindToIsKindAsync(Document document, TextSpa
|
||||
|
||||
protected abstract void FixDiagnostic(DocumentEditor editor, SyntaxNode nodeToFix);
|
||||
|
||||
- private sealed class CustomFixAllProvider : DocumentBasedFixAllProvider
|
||||
+ private sealed class CustomFixAllProvider : Analyzer.Utilities.DocumentBasedFixAllProvider
|
||||
{
|
||||
private readonly PreferIsKindFix _fixer;
|
||||
|
||||
diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj
|
||||
index 114e30a43..e38f8549f 100644
|
||||
--- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj
|
||||
+++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj
|
||||
@@ -7,7 +7,6 @@
|
||||
|
||||
<!-- Avoid ID conflicts with the package project. -->
|
||||
<PackageId>*$(MSBuildProjectFile)*</PackageId>
|
||||
- <MicrosoftCodeAnalysisVersion>4.0.1</MicrosoftCodeAnalysisVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj
|
||||
index a44df8a50..cba084cd5 100644
|
||||
--- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj
|
||||
+++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj
|
||||
@@ -7,7 +7,6 @@
|
||||
|
||||
<!-- Avoid ID conflicts with the package project. -->
|
||||
<PackageId>*$(MSBuildProjectFile)*</PackageId>
|
||||
- <MicrosoftCodeAnalysisVersion>4.0.1</MicrosoftCodeAnalysisVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj
|
||||
index 46a4fca6b..c9fa15584 100644
|
||||
--- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj
|
||||
+++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj
|
||||
@@ -7,7 +7,6 @@
|
||||
|
||||
<!-- Avoid ID conflicts with the package project. -->
|
||||
<PackageId>*$(MSBuildProjectFile)*</PackageId>
|
||||
- <MicrosoftCodeAnalysisVersion>4.0.1</MicrosoftCodeAnalysisVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
diff --git a/src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/InteropServices/CSharpDisableRuntimeMarshalling.FixAllProvider.cs b/src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/InteropServices/CSharpDisableRuntimeMarshalling.FixAllProvider.cs
|
||||
index 4bb27f03d..6d93ac3f7 100644
|
||||
--- a/src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/InteropServices/CSharpDisableRuntimeMarshalling.FixAllProvider.cs
|
||||
+++ b/src/NetAnalyzers/CSharp/Microsoft.NetCore.Analyzers/InteropServices/CSharpDisableRuntimeMarshalling.FixAllProvider.cs
|
||||
@@ -15,7 +15,7 @@ namespace Microsoft.NetCore.Analyzers.InteropServices
|
||||
{
|
||||
public sealed partial class CSharpDisableRuntimeMarshallingFixer
|
||||
{
|
||||
- private class CustomFixAllProvider : DocumentBasedFixAllProvider
|
||||
+ private class CustomFixAllProvider : Analyzer.Utilities.DocumentBasedFixAllProvider
|
||||
{
|
||||
public static readonly CustomFixAllProvider Instance = new();
|
||||
|
||||
diff --git a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs b/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs
|
||||
index 331c0a4fe..492d0d4c1 100644
|
||||
--- a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs
|
||||
+++ b/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs
|
||||
@@ -74,7 +74,7 @@ public sealed override FixAllProvider GetFixAllProvider()
|
||||
return CustomFixAllProvider.Instance;
|
||||
}
|
||||
|
||||
- private sealed class CustomFixAllProvider : DocumentBasedFixAllProvider
|
||||
+ private sealed class CustomFixAllProvider : Analyzer.Utilities.DocumentBasedFixAllProvider
|
||||
{
|
||||
public static readonly CustomFixAllProvider Instance = new();
|
||||
|
||||
diff --git a/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj b/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj
|
||||
index e62266894..b858d7097 100644
|
||||
--- a/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj
|
||||
+++ b/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj
|
||||
@@ -10,7 +10,7 @@
|
||||
<InternalsVisibleTo Include="Roslyn.Diagnostics.Analyzers.UnitTests" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
- <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)" />
|
||||
+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
|
||||
</ItemGroup>
|
||||
<Import Project="..\..\Utilities\Refactoring.CSharp\Refactoring.CSharp.Utilities.projitems" Label="Shared" />
|
||||
</Project>
|
||||
\ No newline at end of file
|
||||
diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj b/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj
|
||||
index 60450aee0..3489028d4 100644
|
||||
--- a/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj
|
||||
+++ b/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj
|
||||
@@ -7,7 +7,6 @@
|
||||
Restore would conclude that there is a cyclic dependency between us and the Roslyn.Diagnostics.Analyzers package.
|
||||
-->
|
||||
<PackageId>*$(MSBuildProjectFile)*</PackageId>
|
||||
- <MicrosoftCodeAnalysisVersion>$(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)</MicrosoftCodeAnalysisVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<InternalsVisibleTo Include="Roslyn.Diagnostics.CSharp.Analyzers" />
|
||||
diff --git a/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj
|
||||
index 509a3c069..737a2cf24 100644
|
||||
--- a/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj
|
||||
+++ b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj
|
||||
@@ -7,7 +7,7 @@
|
||||
<ProjectReference Include="..\Core\Roslyn.Diagnostics.Analyzers.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
- <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)" />
|
||||
+ <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
|
||||
</ItemGroup>
|
||||
<Import Project="..\..\Utilities\Refactoring.VisualBasic\Refactoring.VisualBasic.Utilities.projitems" Label="Shared" />
|
||||
</Project>
|
||||
\ No newline at end of file
|
||||
diff --git a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj
|
||||
index c00a9ab5d..74f5f4d5a 100644
|
||||
--- a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj
|
||||
+++ b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj
|
||||
@@ -5,7 +5,6 @@
|
||||
<NonShipping>true</NonShipping>
|
||||
<UseAppHost>false</UseAppHost>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
- <MicrosoftCodeAnalysisVersion>$(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)</MicrosoftCodeAnalysisVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\Microsoft.CodeAnalysis.Analyzers\Core\MetaAnalyzers\ReleaseTrackingHelper.cs" Link="ReleaseTrackingHelper.cs" />
|
||||
diff --git a/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj b/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj
|
||||
index fa2233feb..f19ae8d4d 100644
|
||||
--- a/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj
|
||||
+++ b/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj
|
||||
@@ -12,8 +12,6 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
- <PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisExecutableVersion)" />
|
||||
- <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableExecutableVersion)" />
|
||||
- <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataExecutableVersion)" />
|
||||
+ <PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
diff --git a/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersFixer.cs b/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersFixer.cs
|
||||
index 82a3e986c..336bd2a52 100644
|
||||
--- a/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersFixer.cs
|
||||
+++ b/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/UseExceptionThrowHelpersFixer.cs
|
||||
@@ -121,7 +121,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
|
||||
other is not null ? new SyntaxNode[] { arg, other } : new SyntaxNode[] { arg })).WithTriviaFrom(node));
|
||||
}
|
||||
|
||||
- private sealed class CustomFixAllProvider : DocumentBasedFixAllProvider
|
||||
+ private sealed class CustomFixAllProvider : Analyzer.Utilities.DocumentBasedFixAllProvider
|
||||
{
|
||||
public static readonly CustomFixAllProvider Instance = new();
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Thalman <mthalman@microsoft.com>
|
||||
Date: Mon, 20 Mar 2023 15:35:53 -0500
|
||||
Subject: [PATCH] Revert switch to self-hosted NativeAOT compiler
|
||||
|
||||
Backport: https://github.com/dotnet/runtime/issues/83695
|
||||
---
|
||||
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
|
||||
index db48433db73..982bbc78427 100644
|
||||
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
|
||||
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
|
||||
@@ -12,6 +12,7 @@
|
||||
<PublishDir>$(RuntimeBinDir)ilc-published/</PublishDir>
|
||||
<NativeAotSupported Condition="'$(TargetOS)' != 'windows' and '$(TargetOS)' != 'linux' and '$(TargetOS)' != 'osx'">false</NativeAotSupported>
|
||||
<NativeAotSupported Condition="'$(TargetArchitecture)' != 'x64'">false</NativeAotSupported>
|
||||
+ <NativeAotSupported>false</NativeAotSupported>
|
||||
<PublishAot Condition="'$(NativeAotSupported)' == 'true'">true</PublishAot>
|
||||
<SysRoot Condition="'$(NativeAotSupported)' == 'true' and '$(CrossBuild)' == 'true' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
|
||||
<PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
|
||||
|
|
@ -1,143 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Thu, 8 Jun 2023 22:21:02 +0000
|
||||
Subject: [PATCH] Add dependencies needed for source-build PVP flow
|
||||
|
||||
Backport: https://github.com/dotnet/sdk/pull/33039
|
||||
---
|
||||
eng/Version.Details.xml | 68 +++++++++++++++++++++++++++++++++++++++++
|
||||
eng/Versions.props | 28 ++++++++---------
|
||||
2 files changed, 82 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
|
||||
index 2bf363fc70..a242f463ee 100644
|
||||
--- a/eng/Version.Details.xml
|
||||
+++ b/eng/Version.Details.xml
|
||||
@@ -112,15 +112,83 @@
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>8dea0b8d3bf5852fe61b2d98b94ae190f68b9768</Sha>
|
||||
</Dependency>
|
||||
+ <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.3.57">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
<Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
</Dependency>
|
||||
+ <Dependency Name="NuGet.Build.Tasks.Console" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.Build.Tasks.Pack" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.Commands" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.CommandLine.XPlat" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.Common" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.Configuration" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.Credentials" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.DependencyResolver.Core" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.Frameworks" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.LibraryModel" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.ProjectModel" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.Protocol" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.Packaging" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="NuGet.Versioning" Version="6.7.0-preview.3.57">
|
||||
+ <Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
+ <Sha>1f85d874ef0bc82affad2c2175fdd47c5b4bb387</Sha>
|
||||
+ </Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23307.1">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>8381658bfb847e67b4f41a997411e8a804e1ecb4</Sha>
|
||||
<SourceBuild RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
+ <Dependency Name="Microsoft.TestPlatform.CLI" Version="17.7.0-preview.23307.1">
|
||||
+ <Uri>https://github.com/microsoft/vstest</Uri>
|
||||
+ <Sha>8381658bfb847e67b4f41a997411e8a804e1ecb4</Sha>
|
||||
+ </Dependency>
|
||||
+ <Dependency Name="Microsoft.TestPlatform.Build" Version="17.7.0-preview.23307.1">
|
||||
+ <Uri>https://github.com/microsoft/vstest</Uri>
|
||||
+ <Sha>8381658bfb847e67b4f41a997411e8a804e1ecb4</Sha>
|
||||
+ </Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.6.23307.4">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>54dab738de58291ebefc8ff0569a799efaff5d82</Sha>
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index dfa5c80636..ee10eec2d2 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -61,25 +61,25 @@
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/nuget/nuget.client -->
|
||||
<NuGetBuildTasksPackageVersion>6.7.0-preview.3.57</NuGetBuildTasksPackageVersion>
|
||||
- <NuGetBuildTasksConsolePackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksConsolePackageVersion>
|
||||
+ <NuGetBuildTasksConsolePackageVersion>6.7.0-preview.3.57</NuGetBuildTasksConsolePackageVersion>
|
||||
<NuGetLocalizationPackageVersion>6.0.0-rc.278</NuGetLocalizationPackageVersion>
|
||||
- <NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
|
||||
- <NuGetCommandLineXPlatPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommandLineXPlatPackageVersion>
|
||||
- <NuGetProjectModelPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetProjectModelPackageVersion>
|
||||
- <MicrosoftBuildNuGetSdkResolverPackageVersion>$(NuGetBuildTasksPackageVersion)</MicrosoftBuildNuGetSdkResolverPackageVersion>
|
||||
- <NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion>
|
||||
- <NuGetConfigurationPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetConfigurationPackageVersion>
|
||||
- <NuGetFrameworksPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetFrameworksPackageVersion>
|
||||
- <NuGetPackagingPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetPackagingPackageVersion>
|
||||
- <NuGetVersioningPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetVersioningPackageVersion>
|
||||
- <NuGetPackagingVersion>$(NuGetPackagingPackageVersion)</NuGetPackagingVersion>
|
||||
- <NuGetProjectModelVersion>$(NuGetProjectModelPackageVersion)</NuGetProjectModelVersion>
|
||||
+ <NuGetBuildTasksPackPackageVersion>6.7.0-preview.3.57</NuGetBuildTasksPackPackageVersion>
|
||||
+ <NuGetCommandLineXPlatPackageVersion>6.7.0-preview.3.57</NuGetCommandLineXPlatPackageVersion>
|
||||
+ <NuGetProjectModelPackageVersion>6.7.0-preview.3.57</NuGetProjectModelPackageVersion>
|
||||
+ <MicrosoftBuildNuGetSdkResolverPackageVersion>6.7.0-preview.3.57</MicrosoftBuildNuGetSdkResolverPackageVersion>
|
||||
+ <NuGetCommonPackageVersion>6.7.0-preview.3.57</NuGetCommonPackageVersion>
|
||||
+ <NuGetConfigurationPackageVersion>6.7.0-preview.3.57</NuGetConfigurationPackageVersion>
|
||||
+ <NuGetFrameworksPackageVersion>6.7.0-preview.3.57</NuGetFrameworksPackageVersion>
|
||||
+ <NuGetPackagingPackageVersion>6.7.0-preview.3.57</NuGetPackagingPackageVersion>
|
||||
+ <NuGetVersioningPackageVersion>6.7.0-preview.3.57</NuGetVersioningPackageVersion>
|
||||
+ <NuGetPackagingVersion>6.7.0-preview.3.57</NuGetPackagingVersion>
|
||||
+ <NuGetProjectModelVersion>6.7.0-preview.3.57</NuGetProjectModelVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/Microsoft/vstest -->
|
||||
<MicrosoftNETTestSdkPackageVersion>17.7.0-preview.23307.1</MicrosoftNETTestSdkPackageVersion>
|
||||
- <MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
|
||||
- <MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
|
||||
+ <MicrosoftTestPlatformCLIPackageVersion>17.7.0-preview.23307.1</MicrosoftTestPlatformCLIPackageVersion>
|
||||
+ <MicrosoftTestPlatformBuildPackageVersion>17.7.0-preview.23307.1</MicrosoftTestPlatformBuildPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/runtime -->
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Mon, 12 Jun 2023 16:08:48 +0000
|
||||
Subject: [PATCH 2/2] Additional dependencies for PVP flow
|
||||
|
||||
Backport: https://github.com/dotnet/sdk/pull/33179
|
||||
---
|
||||
eng/Version.Details.xml | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
|
||||
index a242f463ee..645c3720c9 100644
|
||||
--- a/eng/Version.Details.xml
|
||||
+++ b/eng/Version.Details.xml
|
||||
@@ -381,6 +381,21 @@
|
||||
<Sha>27e584661980ee6d82c419a2a471ae505b7d122e</Sha>
|
||||
<SourceBuild RepoName="symreader" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
+ <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
|
||||
+ <Dependency Name="Microsoft.Extensions.Logging.Console" Version="6.0.0">
|
||||
+ <Uri>https://github.com/dotnet/runtime</Uri>
|
||||
+ <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
|
||||
+ </Dependency>
|
||||
+ <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
|
||||
+ <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0">
|
||||
+ <Uri>https://github.com/dotnet/runtime</Uri>
|
||||
+ <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
|
||||
+ </Dependency>
|
||||
+ <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
|
||||
+ <Dependency Name="System.ServiceProcess.ServiceController" Version="7.0.0">
|
||||
+ <Uri>https://github.com/dotnet/runtime</Uri>
|
||||
+ <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
|
||||
+ </Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23302.3">
|
||||
|
|
@ -61,5 +61,9 @@
|
|||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Test doesn't work with newer RIDs"/>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_can_use_latest_with_unsupported_target_framework"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Requires props file not in installer repo"/>
|
||||
</SkippedTests>
|
||||
</Tests>
|
||||
|
|
|
|||
Loading…
Reference in a new issue