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

Merge branch 'main' of https://github.com/dotnet/installer into TestProjectValidation

Browse source
This commit is contained in:
Jackson Schuster 2024-04-01 11:29:19 -07:00
commit df7cd4ff54
23 changed files with 351 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

152
eng/Version.Details.xml
View file

@ -5,41 +5,41 @@
Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. 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. 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-preview.4.24178.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri> <Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>779fc998f3d71a33a0ed59b4acf849b45e9659a2</Sha> <Sha>672c180b467833f824fd19cab7ac76a73138ab6c</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24178.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri> <Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>779fc998f3d71a33a0ed59b4acf849b45e9659a2</Sha> <Sha>672c180b467833f824fd19cab7ac76a73138ab6c</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24178.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri> <Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>779fc998f3d71a33a0ed59b4acf849b45e9659a2</Sha> <Sha>672c180b467833f824fd19cab7ac76a73138ab6c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.4.24178.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri> <Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>779fc998f3d71a33a0ed59b4acf849b45e9659a2</Sha> <Sha>672c180b467833f824fd19cab7ac76a73138ab6c</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24178.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e612bf4d0b6f08623092902c34a504e932388664</Sha> <Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24178.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e612bf4d0b6f08623092902c34a504e932388664</Sha> <Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24178.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e612bf4d0b6f08623092902c34a504e932388664</Sha> <Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24178.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e612bf4d0b6f08623092902c34a504e932388664</Sha> <Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-preview.4.24178.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e612bf4d0b6f08623092902c34a504e932388664</Sha> <Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
</Dependency> </Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack --> <!-- 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. --> <!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@ -47,70 +47,70 @@
<Uri>https://github.com/dotnet/core-setup</Uri> <Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha> <Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-preview.4.24178.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e612bf4d0b6f08623092902c34a504e932388664</Sha> <Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.4.24178.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e612bf4d0b6f08623092902c34a504e932388664</Sha> <Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" /> <SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.4.24177.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>1c8f20be1fc4e97044d7ca93edae3af528bc3521</Sha> <Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.4.24177.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>1c8f20be1fc4e97044d7ca93edae3af528bc3521</Sha> <Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24177.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>1c8f20be1fc4e97044d7ca93edae3af528bc3521</Sha> <Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24177.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>1c8f20be1fc4e97044d7ca93edae3af528bc3521</Sha> <Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-dev-certs" Version="9.0.0-preview.4.24177.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="dotnet-dev-certs" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>1c8f20be1fc4e97044d7ca93edae3af528bc3521</Sha> <Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-user-jwts" Version="9.0.0-preview.4.24177.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="dotnet-user-jwts" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>1c8f20be1fc4e97044d7ca93edae3af528bc3521</Sha> <Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-user-secrets" Version="9.0.0-preview.4.24177.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="dotnet-user-secrets" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>1c8f20be1fc4e97044d7ca93edae3af528bc3521</Sha> <Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="9.0.0-preview.4.24177.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="9.0.0-preview.4.24179.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri> <Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>1c8f20be1fc4e97044d7ca93edae3af528bc3521</Sha> <Sha>6dfaf9e2cff6cfa3aab0b7842fe02fe9f71e0f60</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" /> <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-preview.4.24178.27"> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-preview.4.24181.5">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>722cfe0512e8ef858287d3dcaf0c5e88ed336330</Sha> <Sha>acd489ee0dae8d34e75986978cfd3f2bce1b2288</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-preview.4.24178.27"> <Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-preview.4.24181.5">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>722cfe0512e8ef858287d3dcaf0c5e88ed336330</Sha> <Sha>acd489ee0dae8d34e75986978cfd3f2bce1b2288</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-preview.4.24178.27"> <Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-preview.4.24181.5">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>722cfe0512e8ef858287d3dcaf0c5e88ed336330</Sha> <Sha>acd489ee0dae8d34e75986978cfd3f2bce1b2288</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-preview.4.24178.27"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-preview.4.24181.5">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>722cfe0512e8ef858287d3dcaf0c5e88ed336330</Sha> <Sha>acd489ee0dae8d34e75986978cfd3f2bce1b2288</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="9.0.100-preview.4.24178.27"> <Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="9.0.100-preview.4.24181.5">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>
<Sha>722cfe0512e8ef858287d3dcaf0c5e88ed336330</Sha> <Sha>acd489ee0dae8d34e75986978cfd3f2bce1b2288</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" /> <SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1"> <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
@ -144,22 +144,22 @@
<SourceBuild RepoName="test-templates" ManagedOnly="true" /> <SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.4.24177.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.4.24180.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri> <Uri>https://github.com/dotnet/winforms</Uri>
<Sha>7b7e9b0f5cf667be3326ed8cf11be1f825da672b</Sha> <Sha>5cc859511608804df7a4fd16cb7b7503fd8d76d8</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.4.24177.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.4.24180.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri> <Uri>https://github.com/dotnet/wpf</Uri>
<Sha>69b072ec137ebf5b2efa9d7ffa40183d70625ae2</Sha> <Sha>7b356d191513c508297f3c83640dcda10d3b1c7c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.300-beta.24178.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.300-beta.24179.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri> <Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>20b263ab495669df94b309fce12584b207dc765c</Sha> <Sha>b3701b7936766cf73224c7a55ba04a046b3d1a28</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.300-beta.24178.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.300-beta.24179.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri> <Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>20b263ab495669df94b309fce12584b207dc765c</Sha> <Sha>b3701b7936766cf73224c7a55ba04a046b3d1a28</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" /> <SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24177-07" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24177-07" CoherentParentDependency="Microsoft.NET.Sdk">
@ -172,28 +172,28 @@
<Sha>1cd0d8998250d36c95ed65a76304ef5d1b33e98f</Sha> <Sha>1cd0d8998250d36c95ed65a76304ef5d1b33e98f</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" /> <SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24178.3" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24181.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e612bf4d0b6f08623092902c34a504e932388664</Sha> <Sha>1949bd2e017a0dc1e48b7cfed263051a6ed147a5</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-1.24177.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-1.24180.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>70c173446a3b354fb586e51301fc79aa809fafb4</Sha> <Sha>0288056413b6de0d0941b0b1ed770c273d870fb0</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.11.0-1.24177.10" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.11.0-1.24180.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>70c173446a3b354fb586e51301fc79aa809fafb4</Sha> <Sha>0288056413b6de0d0941b0b1ed770c273d870fb0</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" /> <SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.Build" Version="17.11.0-preview-24178-06" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.Build" Version="17.11.0-preview-24178-16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri> <Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>fc88a31e448201028ca50f890fea3a9878d7c534</Sha> <Sha>7ca3c98fad986066bbf2802c863236b4a0f4e34a</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.0-preview-24178-06" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.0-preview-24178-16" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri> <Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>fc88a31e448201028ca50f890fea3a9878d7c534</Sha> <Sha>7ca3c98fad986066bbf2802c863236b4a0f4e34a</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" /> <SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.10.0-preview.2.97" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="NuGet.Build.Tasks" Version="6.10.0-preview.2.97" CoherentParentDependency="Microsoft.NET.Sdk">
@ -243,17 +243,17 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24177.2"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24179.6">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>689fb2d1b620a9df28c3384d9b208e3654a0f928</Sha> <Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24177.2"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24179.6">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>689fb2d1b620a9df28c3384d9b208e3654a0f928</Sha> <Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24177.2"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24179.6">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>689fb2d1b620a9df28c3384d9b208e3654a0f928</Sha> <Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24168.3"> <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24168.3">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
@ -263,14 +263,14 @@
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>0e9abfee048404d9b994fc64235b42216ce68dad</Sha> <Sha>0e9abfee048404d9b994fc64235b42216ce68dad</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24177.2"> <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24179.6">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>689fb2d1b620a9df28c3384d9b208e3654a0f928</Sha> <Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24177.2"> <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24179.6">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>689fb2d1b620a9df28c3384d9b208e3654a0f928</Sha> <Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13"> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

48
eng/Versions.props
View file

@ -39,7 +39,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24177.2</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24179.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services --> <!-- Dependency from https://github.com/dotnet/arcade-services -->
@ -47,11 +47,11 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.4.24177.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.4.24180.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf --> <!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.4.24177.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion> <MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.4.24180.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates --> <!-- Dependency from https://github.com/dotnet/test-templates -->
@ -67,49 +67,49 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore --> <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24177.3</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion> <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24179.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.4.24177.3</MicrosoftAspNetCoreAppRefPackageVersion> <MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.4.24179.2</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.4.24177.3</MicrosoftAspNetCoreAppRefInternalPackageVersion> <MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.4.24179.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24177.3</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion> <VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24179.2</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
<dotnetdevcertsPackageVersion>9.0.0-preview.4.24177.3</dotnetdevcertsPackageVersion> <dotnetdevcertsPackageVersion>9.0.0-preview.4.24179.2</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>9.0.0-preview.4.24177.3</dotnetuserjwtsPackageVersion> <dotnetuserjwtsPackageVersion>9.0.0-preview.4.24179.2</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>9.0.0-preview.4.24177.3</dotnetusersecretsPackageVersion> <dotnetusersecretsPackageVersion>9.0.0-preview.4.24179.2</dotnetusersecretsPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion> <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk --> <!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24178.27</MicrosoftDotNetCommonItemTemplatesPackageVersion> <MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24181.5</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24178.27</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24181.5</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24178.27</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24181.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn --> <!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-1.24177.10</MicrosoftNetCompilersToolsetPackageVersion> <MicrosoftNetCompilersToolsetPackageVersion>4.11.0-1.24180.2</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx --> <!-- Dependencies from https://github.com/dotnet/corefx -->
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.4.24178.3</MicrosoftNETCorePlatformsPackageVersion> <MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.4.24181.1</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup --> <!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24178.3</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion> <VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24181.1</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.4.24178.3</VSRedistCommonNetCoreTargetingPackx6490PackageVersion> <VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.4.24181.1</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24178.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion> <MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24181.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.4.24178.3</MicrosoftNETCoreAppHostwinx64PackageVersion> <MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.4.24181.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24178.3</MicrosoftNETCoreAppRefPackageVersion> <MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24181.1</MicrosoftNETCoreAppRefPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion> <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop --> <!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24178.2</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion> <VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24181.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.4.24178.2</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion> <VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.4.24181.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.4.24178.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.4.24181.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24178.2</MicrosoftWindowsDesktopAppRefPackageVersion> <MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24181.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 --> <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->

2
eng/common/templates-official/job/onelocbuild.yml
View file

@ -56,7 +56,7 @@ jobs:
# If it's not devdiv, it's dnceng # If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: $(DncEngInternalBuildPool) name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt image: 1es-windows-2022
os: windows os: windows
steps: steps:

4
eng/common/templates-official/job/publish-build-assets.yml
View file

@ -60,8 +60,8 @@ jobs:
os: windows os: windows
# If it's not devdiv, it's dnceng # If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: $(DncEngInternalBuildPool) name: NetCore1ESPool-Publishing-Internal
image: 1es-windows-2022-pt image: windows.vs2019.amd64
os: windows os: windows
steps: steps:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

2
eng/common/templates-official/job/source-build.yml
View file

@ -52,7 +52,7 @@ jobs:
${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
image: 1es-mariner-2-pt image: 1es-mariner-2
os: linux os: linux
${{ if ne(parameters.platform.pool, '') }}: ${{ if ne(parameters.platform.pool, '') }}:

10
eng/common/templates-official/post-build/post-build.yml
View file

@ -110,7 +110,7 @@ stages:
# If it's not devdiv, it's dnceng # If it's not devdiv, it's dnceng
${{ else }}: ${{ else }}:
name: $(DncEngInternalBuildPool) name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt image: 1es-windows-2022
os: windows os: windows
steps: steps:
@ -150,7 +150,7 @@ stages:
# If it's not devdiv, it's dnceng # If it's not devdiv, it's dnceng
${{ else }}: ${{ else }}:
name: $(DncEngInternalBuildPool) name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt image: 1es-windows-2022
os: windows os: windows
steps: steps:
- template: setup-maestro-vars.yml - template: setup-maestro-vars.yml
@ -208,7 +208,7 @@ stages:
# If it's not devdiv, it's dnceng # If it's not devdiv, it's dnceng
${{ else }}: ${{ else }}:
name: $(DncEngInternalBuildPool) name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt image: 1es-windows-2022
os: windows os: windows
steps: steps:
- template: setup-maestro-vars.yml - template: setup-maestro-vars.yml
@ -261,8 +261,8 @@ stages:
os: windows os: windows
# If it's not devdiv, it's dnceng # If it's not devdiv, it's dnceng
${{ else }}: ${{ else }}:
name: $(DncEngInternalBuildPool) name: NetCore1ESPool-Publishing-Internal
image: 1es-windows-2022-pt image: windows.vs2019.amd64
os: windows os: windows
steps: steps:
- template: setup-maestro-vars.yml - template: setup-maestro-vars.yml

2
eng/common/templates-official/variables/pool-providers.yml
View file

@ -23,7 +23,7 @@
# #
# pool: # pool:
# name: $(DncEngInternalBuildPool) # name: $(DncEngInternalBuildPool)
# image: 1es-windows-2022-pt # image: 1es-windows-2022
variables: variables:
# Coalesce the target and source branches so we know when a PR targets a release branch # Coalesce the target and source branches so we know when a PR targets a release branch

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "latest" "cmake": "latest"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2", "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24179.6",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24177.2" "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24179.6"
} }
} }

4
src/SourceBuild/content/eng/Version.Details.xml
View file

@ -3,9 +3,9 @@
<ProductDependencies> <ProductDependencies>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24177.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha> <Sha>689fb2d1b620a9df28c3384d9b208e3654a0f928</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

6
src/SourceBuild/content/eng/Versions.props
View file

@ -23,10 +23,10 @@
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
are not necessary, and this property is removed from the file. are not necessary, and this property is removed from the file.
--> -->
<PrivateSourceBuiltSdkVersion>9.0.100-preview.2.24104.1</PrivateSourceBuiltSdkVersion> <PrivateSourceBuiltSdkVersion>9.0.100-preview.4.24179.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.2.24104.1</PrivateSourceBuiltArtifactsVersion> <PrivateSourceBuiltArtifactsVersion>9.0.100-preview.4.24179.1</PrivateSourceBuiltArtifactsVersion>
<!-- msbuild --> <!-- msbuild -->
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion> <MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
<!-- runtime --> <!-- runtime -->
<MicrosoftExtensionsFileSystemGlobbingVersion>9.0.0-preview.2.24128.5</MicrosoftExtensionsFileSystemGlobbingVersion> <MicrosoftExtensionsFileSystemGlobbingVersion>9.0.0-preview.2.24128.5</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.2.24128.5</MicrosoftExtensionsLoggingConsoleVersion> <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.2.24128.5</MicrosoftExtensionsLoggingConsoleVersion>

6
src/SourceBuild/content/eng/tools/init-build.proj
View file

@ -94,12 +94,12 @@
</Touch> </Touch>
</Target> </Target>
<!-- Build msbuild tasks for the poisoning feature. --> <!-- Build msbuild tasks for the poisoning feature even when EnablePoison!=true to validate that the task project
builds as EnablePoison=true isn't exercised in PR validation. -->
<Target Name="BuildLeakDetection" <Target Name="BuildLeakDetection"
DependsOnTargets="ExtractToolPackage;BuildMSBuildSdkResolver" DependsOnTargets="ExtractToolPackage;BuildMSBuildSdkResolver"
Inputs="$(MSBuildProjectFullPath)" Inputs="$(MSBuildProjectFullPath)"
Outputs="$(BaseIntermediateOutputPath)BuildLeakDetection.complete" Outputs="$(BaseIntermediateOutputPath)BuildLeakDetection.complete">
Condition="'$(EnablePoison)' == 'true'">
<MSBuild Projects="tasks\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj" <MSBuild Projects="tasks\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj"
Targets="Restore" Targets="Restore"
Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" /> Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" />

1
src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj
View file

@ -6,7 +6,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" /> <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
</ItemGroup> </ItemGroup>

99
src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs
View file

@ -22,8 +22,9 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
* For previously source-built sources (PSB), add only the packages that do not exist in any of the current source-built sources. * For previously source-built sources (PSB), add only the packages that do not exist in any of the current source-built sources.
* Also add PSB packages if that package version does not exist in current package sources. * Also add PSB packages if that package version does not exist in current package sources.
* In offline build, remove all existing package source mappings for online sources. * In offline build, remove all existing package source mappings for online sources.
* In online build, filter existing package source mappings to remove anything that exists in any source-build source. * In online build, add online source mappings for all discovered packages from local sources.
* In online build, if NuGet.config didn't have any mappings, add default "*" pattern for all online sources. * In online build, if NuGet.config didn't originally have any mappings, additionally,
* add default "*" pattern to all online source mappings.
*/ */
public class UpdateNuGetConfigPackageSourcesMappings : Task public class UpdateNuGetConfigPackageSourcesMappings : Task
{ {
@ -43,18 +44,26 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
[Required] [Required]
public string SbrpRepoSrcPath { get; set; } public string SbrpRepoSrcPath { get; set; }
private const string SbrpCacheSourceName = "source-build-reference-package-cache"; [Required]
public string SourceBuiltSourceNamePrefix { get; set; }
// allSourcesPackages contains 'package source', 'list of packages' mappings public string SbrpCacheSourceName { get; set; }
public string ReferencePackagesSourceName { get; set; }
public string PreviouslySourceBuiltSourceName { get; set; }
public string[] CustomSources { get; set; }
// allSourcesPackages and oldSourceMappingPatterns contain 'package source', 'list of packages' mappings
private Dictionary<string, List<string>> allSourcesPackages = []; private Dictionary<string, List<string>> allSourcesPackages = [];
private Dictionary<string, List<string>> oldSourceMappingPatterns = [];
// All other dictionaries are: 'package id', 'list of package versions' // All other dictionaries are: 'package id', 'list of package versions'
private Dictionary<string, List<string>> currentPackages = []; private Dictionary<string, List<string>> currentPackages = [];
private Dictionary<string, List<string>> referencePackages = []; private Dictionary<string, List<string>> referencePackages = [];
private Dictionary<string, List<string>> previouslyBuiltPackages = []; private Dictionary<string, List<string>> previouslySourceBuiltPackages = [];
private Dictionary<string, List<string>> oldSourceMappingPatterns = []; private Dictionary<string, List<string>> prebuiltPackages = [];
private string[] CustomSources = ["prebuilt", "net-sdk-supporting-feed"];
public override bool Execute() public override bool Execute()
{ {
@ -79,7 +88,7 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
DiscoverPackagesFromAllSourceBuildSources(pkgSourcesElement); DiscoverPackagesFromAllSourceBuildSources(pkgSourcesElement);
// Discover all SBRP packages if source-build-reference-package-cache source is present in NuGet.config // Discover all SBRP packages if source-build-reference-package-cache source is present in NuGet.config
XElement sbrpCacheSourceElement = pkgSourcesElement.Descendants().FirstOrDefault(e => e.Name == "add" && e.Attribute("key").Value == SbrpCacheSourceName); XElement sbrpCacheSourceElement = GetElement(pkgSourcesElement, "add", SbrpCacheSourceName);
if (sbrpCacheSourceElement != null) if (sbrpCacheSourceElement != null)
{ {
DiscoverPackagesFromSbrpCacheSource(); DiscoverPackagesFromSbrpCacheSource();
@ -101,7 +110,7 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
foreach (string packageSource in allSourcesPackages.Keys) foreach (string packageSource in allSourcesPackages.Keys)
{ {
// Skip sources with zero package patterns // Skip sources with zero package patterns
if (allSourcesPackages[packageSource] != null) if (allSourcesPackages[packageSource]?.Count > 0)
{ {
pkgSrcMappingClearElement.AddAfterSelf(GetPackageMappingsElementForSource(packageSource)); pkgSrcMappingClearElement.AddAfterSelf(GetPackageMappingsElementForSource(packageSource));
} }
@ -111,21 +120,17 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
// If there are none, add default mappings for all online sources. // If there are none, add default mappings for all online sources.
if (BuildWithOnlineFeeds) if (BuildWithOnlineFeeds)
{ {
if (oldSourceMappingPatterns.Count > 0) foreach (var entry in oldSourceMappingPatterns)
{ {
foreach (var entry in oldSourceMappingPatterns) // Skip sources with zero package patterns
if (entry.Value?.Count > 0)
{ {
// Skip sources with zero package patterns pkgSrcMappingElement.Add(GetPackageMappingsElementForSource(entry.Key, entry.Value));
if (entry.Value?.Count > 0)
{
pkgSrcMappingElement.Add(GetPackageMappingsElementForSource(entry.Key, entry.Value));
}
} }
} }
// Union all package sources to get the distinct list. These will get added to // Union all package sources to get the distinct list. These will get added to
// the two custom sourcess (prebuilt and net-sdk-supporting-feed) and all online // all custom sources and all online sources based on the following logic:
// sources based on following logic:
// If there were existing mappings for online feeds, add cummulative mappings // If there were existing mappings for online feeds, add cummulative mappings
// from all feeds to these two. // from all feeds to these two.
// If there were no existing mappings, add default mappings for all online feeds. // If there were no existing mappings, add default mappings for all online feeds.
@ -159,9 +164,14 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
private void AddMappingsForCustomSources(XElement pkgSrcMappingElement, XElement pkgSourcesElement, List<string> packagePatterns) private void AddMappingsForCustomSources(XElement pkgSrcMappingElement, XElement pkgSourcesElement, List<string> packagePatterns)
{ {
if (CustomSources == null)
{
return;
}
foreach (string sourceName in CustomSources) foreach (string sourceName in CustomSources)
{ {
if (null != pkgSourcesElement.Descendants().FirstOrDefault(e => e.Name == "add" && e.Attribute("key").Value == sourceName)) if (null != GetElement(pkgSourcesElement, "add", sourceName))
{ {
ReplaceSourceMappings(pkgSrcMappingElement, sourceName, packagePatterns); ReplaceSourceMappings(pkgSrcMappingElement, sourceName, packagePatterns);
} }
@ -176,10 +186,10 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern))); pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern)));
} }
XElement pkgSrcMappingClearElement = pkgSrcMappingElement.Descendants().FirstOrDefault(e => e.Name == "packageSource" && e.Attribute("key").Value == sourceName); XElement existingPkgSrcElement = GetElement(pkgSrcMappingElement, "packageSource", sourceName);
if (pkgSrcMappingClearElement != null) if (existingPkgSrcElement != null)
{ {
pkgSrcMappingClearElement.ReplaceWith(pkgSrc); existingPkgSrcElement.ReplaceWith(pkgSrc);
} }
else else
{ {
@ -216,9 +226,9 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
private XElement GetPackageMappingsElementForSource(string packageSource) private XElement GetPackageMappingsElementForSource(string packageSource)
{ {
bool isCurrentSourceBuiltSource = bool isCurrentSourceBuiltSource =
packageSource.StartsWith("source-built-") || packageSource.StartsWith(SourceBuiltSourceNamePrefix) ||
packageSource.Equals(SbrpCacheSourceName) || packageSource.Equals(SbrpCacheSourceName) ||
packageSource.Equals("reference-packages"); packageSource.Equals(ReferencePackagesSourceName);
XElement pkgSrc = new XElement("packageSource", new XAttribute("key", packageSource)); XElement pkgSrc = new XElement("packageSource", new XAttribute("key", packageSource));
foreach (string packagePattern in allSourcesPackages[packageSource]) foreach (string packagePattern in allSourcesPackages[packageSource])
@ -230,9 +240,20 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
{ {
pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern))); pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern)));
} }
else else if (packageSource.Equals(PreviouslySourceBuiltSourceName))
{ {
foreach (string version in previouslyBuiltPackages[packagePattern]) foreach (string version in previouslySourceBuiltPackages[packagePattern])
{
if (!currentPackages[packagePattern].Contains(version))
{
pkgSrc.Add(new XElement("package", new XAttribute("pattern", packagePattern)));
break;
}
}
}
else // prebuilt source
{
foreach (string version in prebuiltPackages[packagePattern])
{ {
if (!currentPackages[packagePattern].Contains(version)) if (!currentPackages[packagePattern].Contains(version))
{ {
@ -250,7 +271,7 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
{ {
foreach (string packageSource in SourceBuildSources) foreach (string packageSource in SourceBuildSources)
{ {
XElement sourceElement = pkgSourcesElement.Descendants().FirstOrDefault(e => e.Name == "add" && e.Attribute("key").Value == packageSource); XElement sourceElement = GetElement(pkgSourcesElement, "add", packageSource);
if (sourceElement == null) if (sourceElement == null)
{ {
continue; continue;
@ -270,17 +291,21 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
string version = info.Version.ToLower(); string version = info.Version.ToLower();
// Add package with version to appropriate hashtable // Add package with version to appropriate hashtable
if (packageSource.StartsWith("source-built-")) if (packageSource.StartsWith(SourceBuiltSourceNamePrefix))
{ {
AddToDictionary(currentPackages, id, version); AddToDictionary(currentPackages, id, version);
} }
else if (packageSource.Equals("reference-packages")) else if (packageSource.Equals(ReferencePackagesSourceName))
{ {
AddToDictionary(referencePackages, id, version); AddToDictionary(referencePackages, id, version);
} }
else // previously built packages else if (packageSource.Equals(PreviouslySourceBuiltSourceName))
{ {
AddToDictionary(previouslyBuiltPackages, id, version); AddToDictionary(previouslySourceBuiltPackages, id, version);
}
else // prebuilt source
{
AddToDictionary(prebuiltPackages, id, version);
} }
AddToDictionary(allSourcesPackages, packageSource, id); AddToDictionary(allSourcesPackages, packageSource, id);
@ -318,6 +343,11 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
} }
} }
private XElement GetElement(XElement pkgSourcesElement, string name, string key)
{
return pkgSourcesElement.Descendants().FirstOrDefault(e => e.Name == name && e.Attribute("key").Value == key);
}
private void GetExistingFilteredSourceMappings(XElement pkgSrcMappingElement) private void GetExistingFilteredSourceMappings(XElement pkgSrcMappingElement)
{ {
foreach (XElement packageSource in pkgSrcMappingElement.Descendants().Where(e => e.Name == "packageSource")) foreach (XElement packageSource in pkgSrcMappingElement.Descendants().Where(e => e.Name == "packageSource"))
@ -328,7 +358,8 @@ namespace Microsoft.DotNet.UnifiedBuild.Tasks
string pattern = package.Attribute("pattern").Value.ToLower(); string pattern = package.Attribute("pattern").Value.ToLower();
if (!currentPackages.ContainsKey(pattern) && if (!currentPackages.ContainsKey(pattern) &&
!referencePackages.ContainsKey(pattern) && !referencePackages.ContainsKey(pattern) &&
!previouslyBuiltPackages.ContainsKey(pattern)) !previouslySourceBuiltPackages.ContainsKey(pattern) &&
!prebuiltPackages.ContainsKey(pattern))
{ {
filteredPatterns.Add(pattern); filteredPatterns.Add(pattern);
} }

4
src/SourceBuild/content/global.json
View file

@ -1,10 +1,10 @@
{ {
"tools": { "tools": {
"dotnet": "9.0.100-preview.2.24103.2" "dotnet": "9.0.100-preview.4.24178.10"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0", "Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24102.4" "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2"
} }
} }

3
src/SourceBuild/content/repo-projects/Directory.Build.props
View file

@ -47,6 +47,9 @@
<RepoArtifactsNonShippingPackagesDir Condition="'$(RepositoryName)' != 'source-build-reference-packages'">$([MSBuild]::NormalizeDirectory('$(ArtifactsNonShippingPackagesDir)', '$(RepositoryName)'))</RepoArtifactsNonShippingPackagesDir> <RepoArtifactsNonShippingPackagesDir Condition="'$(RepositoryName)' != 'source-build-reference-packages'">$([MSBuild]::NormalizeDirectory('$(ArtifactsNonShippingPackagesDir)', '$(RepositoryName)'))</RepoArtifactsNonShippingPackagesDir>
<RepoArtifactsNonShippingPackagesDir Condition="'$(RepositoryName)' == 'source-build-reference-packages'">$(ReferencePackagesDir)</RepoArtifactsNonShippingPackagesDir> <RepoArtifactsNonShippingPackagesDir Condition="'$(RepositoryName)' == 'source-build-reference-packages'">$(ReferencePackagesDir)</RepoArtifactsNonShippingPackagesDir>
<SbrpCacheNuGetSourceName>source-build-reference-package-cache</SbrpCacheNuGetSourceName>
<SourceBuiltSourceNamePrefix>source-built-</SourceBuiltSourceNamePrefix>
<!-- Set the bootstrap version to the VMR's version if empty. (no bootstrap set). --> <!-- Set the bootstrap version to the VMR's version if empty. (no bootstrap set). -->
<ArcadeBootstrapVersion>$([MSBuild]::ValueOrDefault('$(ARCADE_BOOTSTRAP_VERSION)', '$(ArcadeSdkVersion)'))</ArcadeBootstrapVersion> <ArcadeBootstrapVersion>$([MSBuild]::ValueOrDefault('$(ARCADE_BOOTSTRAP_VERSION)', '$(ArcadeSdkVersion)'))</ArcadeBootstrapVersion>
</PropertyGroup> </PropertyGroup>

11
src/SourceBuild/content/repo-projects/Directory.Build.targets
View file

@ -66,8 +66,8 @@
<ItemGroup Condition="'@(TransitiveRepositoryReference)' != ''"> <ItemGroup Condition="'@(TransitiveRepositoryReference)' != ''">
<RepositoryReferenceInfo Include="@(TransitiveRepositoryReference)" <RepositoryReferenceInfo Include="@(TransitiveRepositoryReference)"
Exclude="source-build-reference-packages"> Exclude="source-build-reference-packages">
<ShippingSourceName>source-built-%(Identity)</ShippingSourceName> <ShippingSourceName>$(SourceBuiltSourceNamePrefix)%(Identity)</ShippingSourceName>
<NonShippingSourceName>source-built-transport-%(Identity)</NonShippingSourceName> <NonShippingSourceName>$(SourceBuiltSourceNamePrefix)transport-%(Identity)</NonShippingSourceName>
<ShippingPackagesPath>$(ArtifactsShippingPackagesDir)/%(Identity)/</ShippingPackagesPath> <ShippingPackagesPath>$(ArtifactsShippingPackagesDir)/%(Identity)/</ShippingPackagesPath>
<NonShippingPackagesPath>$(ArtifactsNonShippingPackagesDir)/%(Identity)/</NonShippingPackagesPath> <NonShippingPackagesPath>$(ArtifactsNonShippingPackagesDir)/%(Identity)/</NonShippingPackagesPath>
</RepositoryReferenceInfo> </RepositoryReferenceInfo>
@ -190,7 +190,12 @@
NuGetConfigFile="$(NuGetConfigFile)" NuGetConfigFile="$(NuGetConfigFile)"
BuildWithOnlineFeeds="$(DotNetBuildWithOnlineFeeds)" BuildWithOnlineFeeds="$(DotNetBuildWithOnlineFeeds)"
SourceBuildSources="@(_BuildSources)" SourceBuildSources="@(_BuildSources)"
SbrpRepoSrcPath="$(SbrpRepoSrcPath)" /> SbrpRepoSrcPath="$(SbrpRepoSrcPath)"
SbrpCacheSourceName="$(SbrpCacheNuGetSourceName)"
ReferencePackagesSourceName="$(ReferencePackagesNuGetSourceName)"
PreviouslySourceBuiltSourceName="$(PreviouslySourceBuiltNuGetSourceName)"
SourceBuiltSourceNamePrefix="$(SourceBuiltSourceNamePrefix)"
CustomSources="$(NetSdkSupportingFeedName)" />
<MakeDir Directories="$(BaseIntermediateOutputPath)" /> <MakeDir Directories="$(BaseIntermediateOutputPath)" />
<Touch Files="$(BaseIntermediateOutputPath)UpdateNuGetConfig.complete" AlwaysCreate="true"> <Touch Files="$(BaseIntermediateOutputPath)UpdateNuGetConfig.complete" AlwaysCreate="true">

2
src/SourceBuild/content/repo-projects/source-build-reference-packages.proj
View file

@ -27,7 +27,7 @@
<AddSourceToNuGetConfig <AddSourceToNuGetConfig
NuGetConfigFile="$(NuGetConfigFile)" NuGetConfigFile="$(NuGetConfigFile)"
SourceName="source-build-reference-package-cache" SourceName="$(SbrpCacheNuGetSourceName)"
SourcePath="$(LocalNuGetPackageCacheDirectory)" /> SourcePath="$(LocalNuGetPackageCacheDirectory)" />
</Target> </Target>

24
src/SourceBuild/patches/arcade/0001-Downgrade-Microsoft.ApplicationInsights.patch
View file

@ -1,24 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ella Hathaway <ellahath@umich.edu>
Date: Wed, 13 Mar 2024 22:02:04 +0000
Subject: [PATCH] Downgrade Microsoft.ApplicationInsights
Backport: https://github.com/dotnet/source-build/issues/4228
---
Directory.Packages.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 7546dc0b..09a3f791 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -76,7 +76,7 @@
<PackageVersion Include="JetBrains.Annotations" Version="2018.2.1" />
<PackageVersion Include="LZMA-SDK" Version="19.0.0" />
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="2.3.0" />
- <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.22.0" />
+ <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
<PackageVersion Include="Microsoft.Data.OData" Version="5.8.4" />
<PackageVersion Include="Microsoft.DataServices.Client" Version="$(MicrosoftDataServicesClientVersion)" />
<PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="1.0.5" />

25
src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch Normal file
View file

@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 29 Mar 2024 16:33:22 +0000
Subject: [PATCH] Disable CA2022 error
Backport: https://github.com/dotnet/arcade/issues/14668
---
src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs b/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs
index 764a87fa6..e20f70ff4 100644
--- a/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs
+++ b/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs
@@ -30,8 +30,10 @@ public static void Decompress(string sourceFile, string destinationFile)
byte[] properties = new byte[5];
byte[] fileLengthBytes = new byte[8];
+#pragma warning disable CA2022 // Avoid inexact read
inFile.Read(properties, 0, 5);
inFile.Read(fileLengthBytes, 0, 8);
+#pragma warning restore CA2022
long fileLength = BitConverter.ToInt64(fileLengthBytes, 0);
decoder.SetDecoderProperties(properties);

39
src/SourceBuild/patches/nuget-client/0001-Disable-CA2022-errors.patch Normal file
View file

@ -0,0 +1,39 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Sat, 30 Mar 2024 00:25:18 +0000
Subject: [PATCH] Disable CA2022 errors
Backport: https://github.com/NuGet/Home/issues/13361
---
.../Signing/Archive/SignedPackageArchiveUtility.cs | 2 ++
src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveUtility.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveUtility.cs
index 44f3dbdc2..0d133441d 100644
--- a/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveUtility.cs
+++ b/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveUtility.cs
@@ -104,7 +104,9 @@ public static Stream OpenPackageSignatureFileStream(BinaryReader reader)
var buffer = new byte[localFileHeader.UncompressedSize];
reader.BaseStream.Seek(offsetToData, SeekOrigin.Begin);
+#pragma warning disable CA2022 // Avoid inexact read
reader.BaseStream.Read(buffer, offset: 0, count: buffer.Length);
+#pragma warning restore CA2022
return new MemoryStream(buffer, writable: false);
}
diff --git a/src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs b/src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs
index e92a2dc0c..0fb6b35f4 100644
--- a/src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs
+++ b/src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs
@@ -52,7 +52,9 @@ internal Utf8JsonStreamReader(Stream stream, int bufferSize = BufferSizeDefault,
_buffer = _bufferPool.Rent(bufferSize);
_disposed = false;
_stream = stream;
+#pragma warning disable CA2022 // Avoid inexact read
_stream.Read(_buffer, 0, 3);
+#pragma warning restore CA2022
if (!Utf8Bom.AsSpan().SequenceEqual(_buffer.AsSpan(0, 3)))
{
_bufferUsed = 3;

39
src/SourceBuild/patches/sdk/0001-Disable-CA2022-errors.patch Normal file
View file

@ -0,0 +1,39 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 29 Mar 2024 19:48:28 +0000
Subject: [PATCH] Disable CA2022 errors
Backport: https://github.com/dotnet/sdk/issues/39893
---
src/RazorSdk/Tool/Client.cs | 2 ++
src/RazorSdk/Tool/ConnectionHost.cs | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/RazorSdk/Tool/Client.cs b/src/RazorSdk/Tool/Client.cs
index 3a0436aa8b..54c89bf8d6 100644
--- a/src/RazorSdk/Tool/Client.cs
+++ b/src/RazorSdk/Tool/Client.cs
@@ -169,7 +169,9 @@ public override async Task WaitForDisconnectAsync(CancellationToken cancellation
try
{
ServerLogger.Log($"Before poking pipe {Identifier}.");
+#pragma warning disable CA2022 // Avoid inexact read
await Stream.ReadAsync(Array.Empty<byte>(), 0, 0, cancellationToken);
+#pragma warning restore CA2022
ServerLogger.Log($"After poking pipe {Identifier}.");
}
catch (OperationCanceledException)
diff --git a/src/RazorSdk/Tool/ConnectionHost.cs b/src/RazorSdk/Tool/ConnectionHost.cs
index d1c557dea9..f92397d6e9 100644
--- a/src/RazorSdk/Tool/ConnectionHost.cs
+++ b/src/RazorSdk/Tool/ConnectionHost.cs
@@ -107,7 +107,9 @@ public override async Task WaitForDisconnectAsync(CancellationToken cancellation
try
{
ServerLogger.Log($"Before poking pipe {Identifier}.");
+#pragma warning disable CA2022 // Avoid inexact read
await Stream.ReadAsync(Array.Empty<byte>(), 0, 0, cancellationToken);
+#pragma warning restore CA2022
ServerLogger.Log($"After poking pipe {Identifier}.");
}
catch (OperationCanceledException)

25
src/SourceBuild/patches/vstest/0001-Disable-CA2022-errors.patch Normal file
View file

@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 29 Mar 2024 18:27:34 +0000
Subject: [PATCH] Disable CA2022 errors
Backport: https://github.com/microsoft/vstest/issues/4955
---
.../Helpers/DotnetHostHelper.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs
index 519ee3441..3f8192014 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs
@@ -409,8 +409,10 @@ public class DotnetHostHelper : IDotnetHostHelper
using var headerReader = _fileHelper.GetStream(path, FileMode.Open, FileAccess.Read);
var magicBytes = new byte[4];
var cpuInfoBytes = new byte[4];
+#pragma warning disable CA2022 // Avoid inexact read
headerReader.Read(magicBytes, 0, magicBytes.Length);
headerReader.Read(cpuInfoBytes, 0, cpuInfoBytes.Length);
+#pragma warning restore CA2022
var magic = BitConverter.ToUInt32(magicBytes, 0);
var cpuInfo = BitConverter.ToUInt32(cpuInfoBytes, 0);

24
src/SourceBuild/patches/xdt/0001-Disable-CA2022-error.patch Normal file
View file

@ -0,0 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 29 Mar 2024 18:22:05 +0000
Subject: [PATCH] Disable CA2022 error
Backport: https://github.com/dotnet/xdt/issues/583
---
src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs b/src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs
index 5c884d7..1e86c48 100644
--- a/src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs
+++ b/src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs
@@ -90,7 +90,9 @@ public class XmlFileInfoDocument : XmlDocument, IDisposable
Encoding encoding = null;
if (stream.CanSeek) {
byte[] buffer = new byte[3];
+#pragma warning disable CA2022 // Avoid inexact read
stream.Read(buffer, 0, buffer.Length);
+#pragma warning restore CA2022
if (buffer[0] == 0xEF && buffer[1] == 0xBB && buffer[2] == 0xBF)
encoding = Encoding.UTF8;