Merge branch 'main' into darc-main-cca34c37-70c2-4ad7-9600-8803e0df6d18
This commit is contained in:
Matt Thalman
GitHub
commit
ab7f06dd03
8 changed files with 196 additions and 241 deletions
|
|
@ -5,42 +5,42 @@
|
|||
Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos.
|
||||
The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal.
|
||||
-->
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-alpha.1.24061.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-alpha.1.24068.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>35043947917c50e301196493f952d08600e3fd4d</Sha>
|
||||
<Sha>02e434c9aec0eaafcfefb260598de0882e3595c3</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.24061.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.24068.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>35043947917c50e301196493f952d08600e3fd4d</Sha>
|
||||
<Sha>02e434c9aec0eaafcfefb260598de0882e3595c3</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-alpha.1.24061.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-alpha.1.24068.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>35043947917c50e301196493f952d08600e3fd4d</Sha>
|
||||
<Sha>02e434c9aec0eaafcfefb260598de0882e3595c3</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-alpha.1.24061.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-alpha.1.24068.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>35043947917c50e301196493f952d08600e3fd4d</Sha>
|
||||
<Sha>02e434c9aec0eaafcfefb260598de0882e3595c3</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.24061.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.24066.33" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb</Sha>
|
||||
<Sha>dbb335c6ba14b38400b2d8c3a5876698021ec089</Sha>
|
||||
<SourceBuild RepoName="runtime" ManagedOnly="false" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.24061.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.24066.33" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb</Sha>
|
||||
<Sha>dbb335c6ba14b38400b2d8c3a5876698021ec089</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-alpha.1.24061.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-alpha.1.24066.33" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb</Sha>
|
||||
<Sha>dbb335c6ba14b38400b2d8c3a5876698021ec089</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.24061.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.24066.33" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb</Sha>
|
||||
<Sha>dbb335c6ba14b38400b2d8c3a5876698021ec089</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-alpha.1.24061.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-alpha.1.24066.33" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb</Sha>
|
||||
<Sha>dbb335c6ba14b38400b2d8c3a5876698021ec089</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,55 +48,55 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.24061.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.24066.33" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb</Sha>
|
||||
<Sha>dbb335c6ba14b38400b2d8c3a5876698021ec089</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-alpha.1.24061.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-alpha.1.24068.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>a19c70eba3f89c7cbe9447f029b4c63322f47846</Sha>
|
||||
<Sha>b89e21ed72c7afd58fd372f7b8e6299847a8153a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-alpha.1.24061.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-alpha.1.24068.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>a19c70eba3f89c7cbe9447f029b4c63322f47846</Sha>
|
||||
<Sha>b89e21ed72c7afd58fd372f7b8e6299847a8153a</Sha>
|
||||
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.24061.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.24068.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>a19c70eba3f89c7cbe9447f029b4c63322f47846</Sha>
|
||||
<Sha>b89e21ed72c7afd58fd372f7b8e6299847a8153a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.24061.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.24068.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>a19c70eba3f89c7cbe9447f029b4c63322f47846</Sha>
|
||||
<Sha>b89e21ed72c7afd58fd372f7b8e6299847a8153a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="9.0.0-alpha.1.24061.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="9.0.0-alpha.1.24068.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>a19c70eba3f89c7cbe9447f029b4c63322f47846</Sha>
|
||||
<Sha>b89e21ed72c7afd58fd372f7b8e6299847a8153a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-jwts" Version="9.0.0-alpha.1.24061.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-jwts" Version="9.0.0-alpha.1.24068.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>a19c70eba3f89c7cbe9447f029b4c63322f47846</Sha>
|
||||
<Sha>b89e21ed72c7afd58fd372f7b8e6299847a8153a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="9.0.0-alpha.1.24061.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="9.0.0-alpha.1.24068.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>a19c70eba3f89c7cbe9447f029b4c63322f47846</Sha>
|
||||
<Sha>b89e21ed72c7afd58fd372f7b8e6299847a8153a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-alpha.1.24062.7">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-alpha.1.24069.4">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>231e921dd53cb4f57acfae42b5984e4103d6b557</Sha>
|
||||
<Sha>734bbd953941b957173151a597c08e2bb75836d0</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-alpha.1.24062.7">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-alpha.1.24069.4">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>231e921dd53cb4f57acfae42b5984e4103d6b557</Sha>
|
||||
<Sha>734bbd953941b957173151a597c08e2bb75836d0</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-alpha.1.24062.7">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-alpha.1.24069.4">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>231e921dd53cb4f57acfae42b5984e4103d6b557</Sha>
|
||||
<Sha>734bbd953941b957173151a597c08e2bb75836d0</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-alpha.1.24062.7">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-alpha.1.24069.4">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>231e921dd53cb4f57acfae42b5984e4103d6b557</Sha>
|
||||
<Sha>734bbd953941b957173151a597c08e2bb75836d0</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>
|
||||
|
|
@ -124,45 +124,45 @@
|
|||
<Sha>81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4</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="9.0.0-alpha.1.24060.12" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-alpha.1.24067.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>03d1fd7ba7f16194c80b5bf39a4879ac0c7a823c</Sha>
|
||||
<Sha>f7d6850caa53f62816d977e737d6cb2a537f0d9a</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-alpha.1.24061.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-alpha.1.24068.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>793eb57cc75af91afad52eb77676c63f0001e49a</Sha>
|
||||
<Sha>c23d7c3676e23504272032393f1a1a1d5f3fe2f1</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.200-beta.24060.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.300-beta.24066.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>b65db15f3262c439f81e6d02c0b8a6892a737e60</Sha>
|
||||
<Sha>8d7795d4a68a21010577f11084ba937e51daf9a3</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.200-beta.24060.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.300-beta.24066.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>b65db15f3262c439f81e6d02c0b8a6892a737e60</Sha>
|
||||
<Sha>8d7795d4a68a21010577f11084ba937e51daf9a3</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-preview-24059-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-preview-24067-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>17723493fc8befbb889db2ff17b1ac98ba7b7c48</Sha>
|
||||
<Sha>1c68c247cc3d69ad04afeb574c3d0bc352ff16e5</Sha>
|
||||
<SourceBuild RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.24061.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.24066.33" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>22ba7d607bb1d9caa0db9afcdc47eb5cef641fcb</Sha>
|
||||
<Sha>dbb335c6ba14b38400b2d8c3a5876698021ec089</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-1.24061.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-1.24067.21" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>514b5364881b9a36a2630ab7c0160f8e642fc1b3</Sha>
|
||||
<Sha>3cd939f76803da435c20b082a5cfcc844386fcfb</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.10.0-preview-24060-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.10.0-preview-24068-04" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>1725b247e8737804076c8ff3b09fcee02ecdf51e</Sha>
|
||||
<Sha>f9b862a1351872f041ca93b0a044379ba4cc37ba</Sha>
|
||||
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-rc.74" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-rc.86" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
<Sha>e92be3915309e687044768de38933ac5fc4cb40c</Sha>
|
||||
<Sha>d55931a69dcda3dcb87ba46a09fe268e0febc223</Sha>
|
||||
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
||||
|
|
@ -195,13 +195,13 @@
|
|||
<Sha>6fc8c1ac45220a4d9b4c59bf2ff187dafcb1da3f</Sha>
|
||||
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.24059.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.24068.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/command-line-api</Uri>
|
||||
<Sha>27035e88527f555a3806ae7d63af7501b41ea5d5</Sha>
|
||||
<Sha>ecd2ce5eafbba3008a7d4f5d04b025d30928c812</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.505902" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.506801" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/command-line-api</Uri>
|
||||
<Sha>27035e88527f555a3806ae7d63af7501b41ea5d5</Sha>
|
||||
<Sha>ecd2ce5eafbba3008a7d4f5d04b025d30928c812</Sha>
|
||||
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
|
|
|
|||
|
|
@ -48,11 +48,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-alpha.1.24060.12</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-alpha.1.24067.8</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-alpha.1.24061.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-alpha.1.24068.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -73,49 +73,49 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.24061.8</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-alpha.1.24061.8</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-alpha.1.24061.8</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.24061.8</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>9.0.0-alpha.1.24061.8</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>9.0.0-alpha.1.24061.8</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>9.0.0-alpha.1.24061.8</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.24068.16</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-alpha.1.24068.16</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-alpha.1.24068.16</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.24068.16</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>9.0.0-alpha.1.24068.16</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>9.0.0-alpha.1.24068.16</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>9.0.0-alpha.1.24068.16</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-alpha.1.24062.7</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>9.0.100-alpha.1.24062.7</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-alpha.1.24062.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-alpha.1.24069.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>9.0.100-alpha.1.24069.4</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-alpha.1.24069.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-1.24061.4</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-1.24067.21</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-alpha.1.24061.26</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-alpha.1.24066.33</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.24061.26</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-alpha.1.24061.26</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.24061.26</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-alpha.1.24061.26</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.24061.26</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.24066.33</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-alpha.1.24066.33</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.24066.33</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-alpha.1.24066.33</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.24066.33</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.24061.5</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-alpha.1.24061.5</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-alpha.1.24061.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-alpha.1.24061.5</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.24068.7</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-alpha.1.24068.7</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-alpha.1.24068.7</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-alpha.1.24068.7</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
@ -127,7 +127,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
|
||||
<NuGetBuildTasksPackageVersion>6.9.0-rc.74</NuGetBuildTasksPackageVersion>
|
||||
<NuGetBuildTasksPackageVersion>6.9.0-rc.86</NuGetBuildTasksPackageVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
|
||||
<PropertyGroup>
|
||||
|
|
@ -245,7 +245,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.10.0-preview-24059-03</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.10.0-preview-24067-01</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-alpha.1.24058.10</MicrosoftExtensionsLoggingConsoleVersion>
|
||||
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.24057.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 'armv6'">armv6</TargetArchitecture>
|
||||
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 'armel'">armel</TargetArchitecture>
|
||||
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 'arm64'">arm64</TargetArchitecture>
|
||||
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 'riscv64'">riscv64</TargetArchitecture>
|
||||
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 'loongarch64'">loongarch64</TargetArchitecture>
|
||||
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 's390x'">s390x</TargetArchitecture>
|
||||
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 'ppc64le'">ppc64le</TargetArchitecture>
|
||||
|
|
|
|||
|
|
@ -119,9 +119,9 @@
|
|||
<ArmEnvironmentVariables Condition="'$(Platform)' == 'armel'">ROOTFS_DIR=$(ArtifactsObjDir)crossrootfs/armel</ArmEnvironmentVariables>
|
||||
</PropertyGroup>
|
||||
|
||||
<Exec Command="$(ArmEnvironmentVariables) $(RepositoryEngineeringDir)cross/build-rootfs.sh"
|
||||
Condition="$(TargetArchitecture.Contains('arm')) and '$(TargetArchitecture)' != 'armel' and '$(BuildArchitecture)' != 'arm64' and '$(BuildArchitecture)' != 'arm'" />
|
||||
<Exec Command="$(ArmEnvironmentVariables) $(RepositoryEngineeringDir)cross/armel/tizen-build-rootfs.sh"
|
||||
<Exec Command="$(ArmEnvironmentVariables) $(RepositoryEngineeringDir)common/cross/build-rootfs.sh"
|
||||
Condition="'$(TargetArchitecture)' != 'armel' and '$(BuildArchitecture)' != '$(TargetArchitecture)'" />
|
||||
<Exec Command="$(ArmEnvironmentVariables) $(RepositoryEngineeringDir)common/cross/armel/tizen-build-rootfs.sh"
|
||||
Condition="'$(TargetArchitecture)' == 'armel'" />
|
||||
</Target>
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Thalman <mthalman@microsoft.com>
|
||||
Date: Fri, 19 Jan 2024 08:55:05 -0600
|
||||
Subject: [PATCH] Remove RazorCompiler dependency
|
||||
|
||||
Backport: https://github.com/dotnet/format/issues/2075
|
||||
---
|
||||
Directory.Packages.props | 1 -
|
||||
src/dotnet-format.csproj | 3 ---
|
||||
2 files changed, 4 deletions(-)
|
||||
|
||||
diff --git a/Directory.Packages.props b/Directory.Packages.props
|
||||
index 8da27dea..1b7df1ce 100644
|
||||
--- a/Directory.Packages.props
|
||||
+++ b/Directory.Packages.props
|
||||
@@ -37,7 +37,6 @@
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisVersion)" />
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisVersion)" />
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
|
||||
- <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler" Version="$(MicrosoftCodeAnalysisVersion)" />
|
||||
|
||||
<!-- runtime -->
|
||||
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
|
||||
diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj
|
||||
index a07a552b..14323f64 100644
|
||||
--- a/src/dotnet-format.csproj
|
||||
+++ b/src/dotnet-format.csproj
|
||||
@@ -35,9 +35,6 @@
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
|
||||
|
||||
- <!-- Included with Microsoft.CodeAnalysis.dll for Razor support -->
|
||||
- <PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler" ExcludeAssets="compile" />
|
||||
-
|
||||
<!-- Loaded dynamically -->
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Features" />
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Thalman <mthalman@microsoft.com>
|
||||
Date: Thu, 18 Jan 2024 10:43:54 -0600
|
||||
Subject: [PATCH] Set NetRoslyn value for VMR build
|
||||
|
||||
Backport: https://github.com/dotnet/roslyn/pull/71704
|
||||
---
|
||||
eng/targets/TargetFrameworks.props | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props
|
||||
index d36aba87611..6061394d5e9 100644
|
||||
--- a/eng/targets/TargetFrameworks.props
|
||||
+++ b/eng/targets/TargetFrameworks.props
|
||||
@@ -49,6 +49,7 @@
|
||||
<NetRoslynToolset>$(NetCurrent)</NetRoslynToolset>
|
||||
<NetRoslynSourceBuild>$(NetCurrent);$(NetPrevious)</NetRoslynSourceBuild>
|
||||
<NetRoslynAll>$(NetCurrent);$(NetPrevious)</NetRoslynAll>
|
||||
+ <NetRoslyn>$(NetCurrent)</NetRoslyn>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
|
||||
|
|
@ -1,127 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Thalman <mthalman@microsoft.com>
|
||||
Date: Tue, 12 Dec 2023 09:47:37 -0600
|
||||
Subject: [PATCH] Use NetCurrent instead of net8.0
|
||||
|
||||
Backport: https://github.com/dotnet/roslyn/pull/71229
|
||||
---
|
||||
.../Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj | 2 +-
|
||||
src/CodeStyle/Tools/CodeStyleConfigFileGenerator.csproj | 2 +-
|
||||
.../Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj | 2 +-
|
||||
.../BoundTreeGenerator/CompilersBoundTreeGenerator.csproj | 2 +-
|
||||
.../CSharpErrorFactsGenerator.csproj | 2 +-
|
||||
.../Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj | 4 ++--
|
||||
.../VisualBasicErrorFactsGenerator.vbproj | 2 +-
|
||||
.../VisualBasicSyntaxGenerator.vbproj | 2 +-
|
||||
8 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj b/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj
|
||||
index c89a8cf4c11..a443f463427 100644
|
||||
--- a/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj
|
||||
+++ b/src/CodeStyle/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj
|
||||
@@ -31,7 +31,7 @@
|
||||
<DotNetExecutable Condition="'$(DotNetExecutable)' == ''">$(DotNetRoot)dotnet</DotNetExecutable>
|
||||
</PropertyGroup>
|
||||
|
||||
- <Exec Command='"$(DotNetExecutable)" "$(ArtifactsBinDir)CodeStyleConfigFileGenerator\$(Configuration)\net8.0\CodeStyleConfigFileGenerator.dll" "CSharp" "$(CSharpCodeStyleFixesArtifactsBinDir)" "$(CSharpCodeStyleTargetsFileName)" "$(CodeStyleAnalyzerArtifactsBinDir)\Microsoft.CodeAnalysis.CodeStyle.dll;$(CSharpCodeStyleAnalyzerArtifactsBinDir)\Microsoft.CodeAnalysis.CSharp.CodeStyle.dll"' />
|
||||
+ <Exec Command='"$(DotNetExecutable)" "$(ArtifactsBinDir)CodeStyleConfigFileGenerator\$(Configuration)\$(NetCurrent)\CodeStyleConfigFileGenerator.dll" "CSharp" "$(CSharpCodeStyleFixesArtifactsBinDir)" "$(CSharpCodeStyleTargetsFileName)" "$(CodeStyleAnalyzerArtifactsBinDir)\Microsoft.CodeAnalysis.CodeStyle.dll;$(CSharpCodeStyleAnalyzerArtifactsBinDir)\Microsoft.CodeAnalysis.CSharp.CodeStyle.dll"' />
|
||||
|
||||
<ItemGroup>
|
||||
<_File Include="$(CSharpCodeStyleAnalyzerArtifactsBinDir)\Microsoft.CodeAnalysis.CSharp.CodeStyle.dll" TargetDir="analyzers/dotnet/cs" />
|
||||
diff --git a/src/CodeStyle/Tools/CodeStyleConfigFileGenerator.csproj b/src/CodeStyle/Tools/CodeStyleConfigFileGenerator.csproj
|
||||
index f5fc7205ca2..d014b53081c 100644
|
||||
--- a/src/CodeStyle/Tools/CodeStyleConfigFileGenerator.csproj
|
||||
+++ b/src/CodeStyle/Tools/CodeStyleConfigFileGenerator.csproj
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
- <TargetFramework>net8.0</TargetFramework>
|
||||
+ <TargetFramework>$(NetCurrent)</TargetFramework>
|
||||
<NonShipping>true</NonShipping>
|
||||
<UseAppHost>false</UseAppHost>
|
||||
<IsShipping>false</IsShipping>
|
||||
diff --git a/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj b/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj
|
||||
index da7b22020e7..2970771349a 100644
|
||||
--- a/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj
|
||||
+++ b/src/CodeStyle/VisualBasic/CodeFixes/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj
|
||||
@@ -31,7 +31,7 @@
|
||||
<DotNetExecutable Condition="'$(DotNetExecutable)' == ''">$(DotNetRoot)dotnet</DotNetExecutable>
|
||||
</PropertyGroup>
|
||||
|
||||
- <Exec Command='"$(DotNetExecutable)" "$(ArtifactsBinDir)CodeStyleConfigFileGenerator\$(Configuration)\net8.0\CodeStyleConfigFileGenerator.dll" "VisualBasic" "$(VisualBasicCodeStyleFixesArtifactsBinDir)" "$(VisualBasicCodeStyleTargetsFileName)" "$(CodeStyleAnalyzerArtifactsBinDir)\Microsoft.CodeAnalysis.CodeStyle.dll;$(VisualBasicCodeStyleAnalyzerArtifactsBinDir)\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.dll"' />
|
||||
+ <Exec Command='"$(DotNetExecutable)" "$(ArtifactsBinDir)CodeStyleConfigFileGenerator\$(Configuration)\$(NetCurrent)\CodeStyleConfigFileGenerator.dll" "VisualBasic" "$(VisualBasicCodeStyleFixesArtifactsBinDir)" "$(VisualBasicCodeStyleTargetsFileName)" "$(CodeStyleAnalyzerArtifactsBinDir)\Microsoft.CodeAnalysis.CodeStyle.dll;$(VisualBasicCodeStyleAnalyzerArtifactsBinDir)\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.dll"' />
|
||||
|
||||
<ItemGroup>
|
||||
<_File Include="$(VisualBasicCodeStyleAnalyzerArtifactsBinDir)\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.dll" TargetDir="analyzers/dotnet/vb" />
|
||||
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj
|
||||
index 6ee9d977752..56b24937c1b 100644
|
||||
--- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj
|
||||
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj
|
||||
@@ -5,7 +5,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>Roslyn.Compilers.Internal.BoundTreeGenerator</RootNamespace>
|
||||
<AssemblyName>BoundTreeGenerator</AssemblyName>
|
||||
- <TargetFramework>net8.0</TargetFramework>
|
||||
+ <TargetFramework>$(NetCurrent)</TargetFramework>
|
||||
<IsShipping>false</IsShipping>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
\ No newline at end of file
|
||||
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj
|
||||
index 63446bef0f8..8b32c86f32a 100644
|
||||
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj
|
||||
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj
|
||||
@@ -4,7 +4,7 @@
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>Roslyn.Compilers.CSharp.Internal.CSharpErrorFactsGenerator</RootNamespace>
|
||||
- <TargetFramework>net8.0</TargetFramework>
|
||||
+ <TargetFramework>$(NetCurrent)</TargetFramework>
|
||||
<IsShipping>false</IsShipping>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
\ No newline at end of file
|
||||
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
|
||||
index 9f8b8b05f26..6f59c13265d 100644
|
||||
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
|
||||
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
|
||||
@@ -3,9 +3,9 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<RootNamespace>CSharpSyntaxGenerator</RootNamespace>
|
||||
- <!-- We build this against net8.0 to build the console app version, and against netstandard2.0 for
|
||||
+ <!-- We build this against $(NetCurrent) to build the console app version, and against netstandard2.0 for
|
||||
the Source Generator version. -->
|
||||
- <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
|
||||
+ <TargetFrameworks>$(NetCurrent);netstandard2.0</TargetFrameworks>
|
||||
<OutputType Condition="'$(TargetFramework)' != 'netstandard2.0'">Exe</OutputType>
|
||||
<RuntimeIdentifiers>$(RoslynPortableRuntimeIdentifiers)</RuntimeIdentifiers>
|
||||
<IsShipping>false</IsShipping>
|
||||
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj
|
||||
index a0f43f33de2..440aa28e6d4 100644
|
||||
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj
|
||||
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj
|
||||
@@ -6,7 +6,7 @@
|
||||
<StartupObject></StartupObject>
|
||||
<RootNamespace>Microsoft.CodeAnalysis.VisualBasic.Internal.VBErrorFactsGenerator</RootNamespace>
|
||||
<AssemblyName>VBErrorFactsGenerator</AssemblyName>
|
||||
- <TargetFramework>net8.0</TargetFramework>
|
||||
+ <TargetFramework>$(NetCurrent)</TargetFramework>
|
||||
<IsShipping>false</IsShipping>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
\ No newline at end of file
|
||||
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj
|
||||
index 1cd0dc4b549..91cc5f2a4ec 100644
|
||||
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj
|
||||
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj
|
||||
@@ -7,7 +7,7 @@
|
||||
<RootNamespace>Microsoft.CodeAnalysis.VisualBasic.Internal.VBSyntaxGenerator</RootNamespace>
|
||||
<AssemblyName>VBSyntaxGenerator</AssemblyName>
|
||||
<OptionStrict>Off</OptionStrict>
|
||||
- <TargetFramework>net8.0</TargetFramework>
|
||||
+ <TargetFramework>$(NetCurrent)</TargetFramework>
|
||||
<IsShipping>false</IsShipping>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -205,10 +205,6 @@
|
|||
linux-ppc64le;
|
||||
"/>
|
||||
|
||||
<Net80AppHostRids Include="
|
||||
@(Net70AppHostRids);
|
||||
" />
|
||||
|
||||
<Net70RuntimePackRids Include="
|
||||
@(Net60RuntimePackRids);
|
||||
linux-bionic-arm;
|
||||
|
|
@ -218,21 +214,34 @@
|
|||
linux-ppc64le;
|
||||
" />
|
||||
|
||||
<Net80RuntimePackRids Include="
|
||||
@(Net70RuntimePackRids);
|
||||
<Net80AppHostRids Include="
|
||||
@(Net70AppHostRids);
|
||||
" />
|
||||
|
||||
<Net80AppHostRids Remove="win-arm" />
|
||||
|
||||
<NetCoreAppHostRids Include="
|
||||
@(Net80AppHostRids);
|
||||
<Net80RuntimePackRids Include="
|
||||
@(Net70RuntimePackRids);
|
||||
" />
|
||||
|
||||
<Net80RuntimePackRids Remove="win-arm" />
|
||||
|
||||
<NetCoreRuntimePackRids Include="
|
||||
@(Net80RuntimePackRids);
|
||||
<Net90AppHostRids Include="
|
||||
@(Net80AppHostRids);
|
||||
linux-riscv64;
|
||||
linux-musl-riscv64;
|
||||
" />
|
||||
|
||||
<Net90RuntimePackRids Include="
|
||||
@(Net80RuntimePackRids);
|
||||
linux-riscv64;
|
||||
linux-musl-riscv64;
|
||||
" />
|
||||
|
||||
<NetCoreAppHostRids Include="@(Net90AppHostRids)" />
|
||||
|
||||
<NetCoreRuntimePackRids Include="@(Net90RuntimePackRids)" />
|
||||
|
||||
<!--
|
||||
In source-build, we build the current RID from source, which may be
|
||||
non-portable and/or not an official RID.
|
||||
|
|
@ -283,11 +292,15 @@
|
|||
@(Net70MonoRuntimePackRids);
|
||||
" />
|
||||
|
||||
<MonoRuntimePackRids Include="
|
||||
<Net80MonoRuntimePackRids Remove="win-arm" />
|
||||
|
||||
<Net90MonoRuntimePackRids Include="
|
||||
@(Net80MonoRuntimePackRids);
|
||||
linux-riscv64;
|
||||
linux-musl-riscv64;
|
||||
" />
|
||||
|
||||
<MonoRuntimePackRids Remove="win-arm" />
|
||||
<MonoRuntimePackRids Include="@(Net90MonoRuntimePackRids)" />
|
||||
|
||||
<AspNetCore30RuntimePackRids Include="
|
||||
win-x64;
|
||||
|
|
@ -320,9 +333,15 @@
|
|||
|
||||
<Net80Crossgen2SupportedRids Include="@(Net70Crossgen2SupportedRids)" />
|
||||
|
||||
<Crossgen2SupportedRids Include="@(Net80Crossgen2SupportedRids)" />
|
||||
<Net80Crossgen2SupportedRids Remove="win-arm" />
|
||||
|
||||
<Crossgen2SupportedRids Remove="win-arm" />
|
||||
<Net90Crossgen2SupportedRids Include="
|
||||
@(Net80Crossgen2SupportedRids);
|
||||
linux-riscv64;
|
||||
linux-musl-riscv64
|
||||
" />
|
||||
|
||||
<Crossgen2SupportedRids Include="@(Net90Crossgen2SupportedRids);" />
|
||||
|
||||
<Net70ILCompilerSupportedRids Include="
|
||||
linux-arm64;
|
||||
|
|
@ -359,7 +378,7 @@
|
|||
"
|
||||
/>
|
||||
|
||||
<NativeAOTRuntimePackRids Include="
|
||||
<Net90NativeAOTRuntimePackRids Include="
|
||||
@(Net80NativeAOTRuntimePackRids);
|
||||
linux-x64;
|
||||
linux-arm64;
|
||||
|
|
@ -372,13 +391,16 @@
|
|||
"
|
||||
/>
|
||||
|
||||
<NativeAOTRuntimePackRids Include="@(Net90NativeAOTRuntimePackRids)" />
|
||||
|
||||
<AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" />
|
||||
<AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);linux-musl-arm;win-arm64" />
|
||||
<AspNetCore60RuntimePackRids Include="@(AspNetCore50RuntimePackRids);osx-arm64;linux-s390x;linux-loongarch64" />
|
||||
<AspNetCore70RuntimePackRids Include="@(AspNetCore60RuntimePackRids);linux-ppc64le" />
|
||||
<AspNetCore80RuntimePackRids Include="@(AspNetCore70RuntimePackRids)" />
|
||||
<AspNetCore80RuntimePackRids Remove="win-arm" />
|
||||
<AspNetCoreRuntimePackRids Include="@(AspNetCore80RuntimePackRids)" />
|
||||
<AspNetCore90RuntimePackRids Include="@(AspNetCore80RuntimePackRids);linux-riscv64;linux-musl-riscv64" />
|
||||
<AspNetCoreRuntimePackRids Include="@(AspNetCore90RuntimePackRids)" />
|
||||
|
||||
<WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
|
||||
<WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
|
||||
|
|
|
|||
Loading…
Reference in a new issue