Merge branch 'main' into feature/installer-merge
# Conflicts: # eng/Version.Details.xml # eng/Versions.props # global.json
This commit is contained in:
Michael Yanni
commit
378b683a33
37 changed files with 528 additions and 372 deletions
|
|
@ -56,8 +56,8 @@ extends:
|
|||
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
|
||||
cblMariner20Fpm:
|
||||
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
|
||||
centosStream8:
|
||||
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
|
||||
centosStream9:
|
||||
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
|
||||
debian11Amd64:
|
||||
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
|
||||
fedora39:
|
||||
|
|
@ -128,8 +128,8 @@ extends:
|
|||
- template: eng/build.yml@self
|
||||
parameters:
|
||||
agentOs: Linux
|
||||
jobName: Build_CentOS_8_Stream_Debug_x64
|
||||
container: centosStream8
|
||||
jobName: Build_CentOS_9_Stream_Debug_x64
|
||||
container: centosStream9
|
||||
buildConfiguration: Debug
|
||||
buildArchitecture: x64
|
||||
linuxPortable: false
|
||||
|
|
|
|||
|
|
@ -5,41 +5,41 @@
|
|||
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-preview.4.24202.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.4.24204.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>0c21ff31531b14dc1712e2811625beb51cacee97</Sha>
|
||||
<Sha>1233632200ec6df0ca38fa1c7ad54f7d820fa9c5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24202.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24204.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>0c21ff31531b14dc1712e2811625beb51cacee97</Sha>
|
||||
<Sha>1233632200ec6df0ca38fa1c7ad54f7d820fa9c5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24202.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24204.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>0c21ff31531b14dc1712e2811625beb51cacee97</Sha>
|
||||
<Sha>1233632200ec6df0ca38fa1c7ad54f7d820fa9c5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.4.24202.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.4.24204.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>0c21ff31531b14dc1712e2811625beb51cacee97</Sha>
|
||||
<Sha>1233632200ec6df0ca38fa1c7ad54f7d820fa9c5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24202.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24204.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>995989e8b33864648080c55e31116d9818b8760c</Sha>
|
||||
<Sha>ffb257818db89672d84d538964cec1b54fb2a094</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24202.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.4.24204.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>995989e8b33864648080c55e31116d9818b8760c</Sha>
|
||||
<Sha>ffb257818db89672d84d538964cec1b54fb2a094</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24202.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-preview.4.24204.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>995989e8b33864648080c55e31116d9818b8760c</Sha>
|
||||
<Sha>ffb257818db89672d84d538964cec1b54fb2a094</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24202.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24204.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>995989e8b33864648080c55e31116d9818b8760c</Sha>
|
||||
<Sha>ffb257818db89672d84d538964cec1b54fb2a094</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-preview.4.24202.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-preview.4.24204.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>995989e8b33864648080c55e31116d9818b8760c</Sha>
|
||||
<Sha>ffb257818db89672d84d538964cec1b54fb2a094</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. -->
|
||||
|
|
@ -47,70 +47,70 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-preview.4.24202.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-preview.4.24204.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>995989e8b33864648080c55e31116d9818b8760c</Sha>
|
||||
<Sha>ffb257818db89672d84d538964cec1b54fb2a094</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.4.24202.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.4.24204.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>995989e8b33864648080c55e31116d9818b8760c</Sha>
|
||||
<Sha>ffb257818db89672d84d538964cec1b54fb2a094</Sha>
|
||||
<SourceBuild RepoName="runtime" ManagedOnly="false" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.4.24202.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.4.24205.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4e75678e761c993ed85b108fab57353eeecf5245</Sha>
|
||||
<Sha>76a4e7507352de5cbabfd8d0130b69012442fe3f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.4.24202.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.4.24205.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4e75678e761c993ed85b108fab57353eeecf5245</Sha>
|
||||
<Sha>76a4e7507352de5cbabfd8d0130b69012442fe3f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24202.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24205.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4e75678e761c993ed85b108fab57353eeecf5245</Sha>
|
||||
<Sha>76a4e7507352de5cbabfd8d0130b69012442fe3f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24202.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24205.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4e75678e761c993ed85b108fab57353eeecf5245</Sha>
|
||||
<Sha>76a4e7507352de5cbabfd8d0130b69012442fe3f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="9.0.0-preview.4.24202.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="9.0.0-preview.4.24205.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4e75678e761c993ed85b108fab57353eeecf5245</Sha>
|
||||
<Sha>76a4e7507352de5cbabfd8d0130b69012442fe3f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-jwts" Version="9.0.0-preview.4.24202.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-jwts" Version="9.0.0-preview.4.24205.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4e75678e761c993ed85b108fab57353eeecf5245</Sha>
|
||||
<Sha>76a4e7507352de5cbabfd8d0130b69012442fe3f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="9.0.0-preview.4.24202.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="9.0.0-preview.4.24205.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4e75678e761c993ed85b108fab57353eeecf5245</Sha>
|
||||
<Sha>76a4e7507352de5cbabfd8d0130b69012442fe3f</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="9.0.0-preview.4.24202.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="9.0.0-preview.4.24205.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>4e75678e761c993ed85b108fab57353eeecf5245</Sha>
|
||||
<Sha>76a4e7507352de5cbabfd8d0130b69012442fe3f</Sha>
|
||||
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-preview.4.24202.52">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-preview.4.24205.2">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>9d6ed6d197399176e0110fe83d2ef0f86baac8a2</Sha>
|
||||
<Sha>54a101e9c8682d7260c382b6de04653e21cfe0b9</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-preview.4.24202.52">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-preview.4.24205.2">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>9d6ed6d197399176e0110fe83d2ef0f86baac8a2</Sha>
|
||||
<Sha>54a101e9c8682d7260c382b6de04653e21cfe0b9</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-preview.4.24202.52">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-preview.4.24205.2">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>9d6ed6d197399176e0110fe83d2ef0f86baac8a2</Sha>
|
||||
<Sha>54a101e9c8682d7260c382b6de04653e21cfe0b9</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-preview.4.24202.52">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-preview.4.24205.2">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>9d6ed6d197399176e0110fe83d2ef0f86baac8a2</Sha>
|
||||
<Sha>54a101e9c8682d7260c382b6de04653e21cfe0b9</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="9.0.100-preview.4.24202.52">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="9.0.100-preview.4.24205.2">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>9d6ed6d197399176e0110fe83d2ef0f86baac8a2</Sha>
|
||||
<Sha>54a101e9c8682d7260c382b6de04653e21cfe0b9</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
|
||||
|
|
@ -133,48 +133,48 @@
|
|||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rc.24202.1">
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rc.24203.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
|
||||
<Sha>3c37712adb7b45506e8445f349367222b35a97dd</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rc.24202.1">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rc.24203.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
<Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
|
||||
<Sha>3c37712adb7b45506e8445f349367222b35a97dd</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</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-preview.4.24201.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.4.24203.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>6710618bf954958130cd0e940cc25223079b12d5</Sha>
|
||||
<Sha>3c3f911e162ab3528fe14b3f221bcc4c4bd447ec</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.4.24202.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.4.24204.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>25ba139a0c67220a843c989343d27580877c3f8b</Sha>
|
||||
<Sha>f1ebf9d0652f379a98482b276860b0f5aa19627b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.300-beta.24202.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.300-beta.24203.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>1632b069d8b6a8f323e9f53240a500bf71387c43</Sha>
|
||||
<Sha>31fccb72266fabbf4f82208fca4e0a5c1b687406</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.300-beta.24202.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.300-beta.24203.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>1632b069d8b6a8f323e9f53240a500bf71387c43</Sha>
|
||||
<Sha>31fccb72266fabbf4f82208fca4e0a5c1b687406</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</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-24203-04" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>1cd0d8998250d36c95ed65a76304ef5d1b33e98f</Sha>
|
||||
<Sha>56d28849af08dc3143d019694aa92f186b89d2ac</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.vstest" Version="17.10.0-release-24177-07" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.vstest" Version="17.10.0-release-24203-04" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>1cd0d8998250d36c95ed65a76304ef5d1b33e98f</Sha>
|
||||
<Sha>56d28849af08dc3143d019694aa92f186b89d2ac</Sha>
|
||||
<SourceBuild RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24202.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.4.24204.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>995989e8b33864648080c55e31116d9818b8760c</Sha>
|
||||
<Sha>ffb257818db89672d84d538964cec1b54fb2a094</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-1.24180.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
|
|
@ -201,19 +201,14 @@
|
|||
<Sha>fb50d1a45ed10b39b5f335bc3a4bdcaea9b951cf</Sha>
|
||||
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<!-- This is only used by source build SmokeTests. -->
|
||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
||||
<Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
|
||||
<Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.4.24176.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.4.24201.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>5b7beea1daa64d283d62d52a0027b13ee9484ff6</Sha>
|
||||
<Sha>bd79d3dd7ed2db36b3c3d4fa807c21a06d2024ec</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.0-preview.4.24176.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.0-preview.4.24201.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>5b7beea1daa64d283d62d52a0027b13ee9484ff6</Sha>
|
||||
<Sha>bd79d3dd7ed2db36b3c3d4fa807c21a06d2024ec</Sha>
|
||||
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.24172.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
@ -244,17 +239,17 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24201.3">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24203.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>0ffb8e9f4a064d8c77f07420dc399baec9daef89</Sha>
|
||||
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24201.3">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24203.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>0ffb8e9f4a064d8c77f07420dc399baec9daef89</Sha>
|
||||
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24201.3">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24203.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>0ffb8e9f4a064d8c77f07420dc399baec9daef89</Sha>
|
||||
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24168.3">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
|
|
@ -264,14 +259,14 @@
|
|||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>0e9abfee048404d9b994fc64235b42216ce68dad</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24201.3">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24203.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>0ffb8e9f4a064d8c77f07420dc399baec9daef89</Sha>
|
||||
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24201.3">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24203.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>0ffb8e9f4a064d8c77f07420dc399baec9daef89</Sha>
|
||||
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24201.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24203.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||
|
|
@ -47,11 +47,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.4.24201.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.4.24203.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.4.24202.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.4.24204.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.24202.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24202.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24203.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
|
||||
|
|
@ -67,22 +67,22 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24202.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.4.24202.2</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.4.24202.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24202.2</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<DotnetDevCertsPackageVersion>9.0.0-preview.4.24202.2</DotnetDevCertsPackageVersion>
|
||||
<DotnetUserJwtsPackageVersion>9.0.0-preview.4.24202.2</DotnetUserJwtsPackageVersion>
|
||||
<DotnetUserSecretsPackageVersion>9.0.0-preview.4.24202.2</DotnetUserSecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24205.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.4.24205.2</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.4.24205.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24205.2</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<DotnetDevCertsPackageVersion>9.0.0-preview.4.24205.2</DotnetDevCertsPackageVersion>
|
||||
<DotnetUserJwtsPackageVersion>9.0.0-preview.4.24205.2</DotnetUserJwtsPackageVersion>
|
||||
<DotnetUserSecretsPackageVersion>9.0.0-preview.4.24205.2</DotnetUserSecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24202.52</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24202.52</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24202.52</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24205.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24205.2</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24205.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -93,23 +93,23 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.4.24202.9</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.4.24204.3</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24202.9</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.4.24202.9</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24202.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.4.24202.9</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24202.9</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24204.3</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.4.24204.3</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24204.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.4.24204.3</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24204.3</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24202.13</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.4.24202.13</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.4.24202.13</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24202.13</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24204.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.4.24204.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.4.24204.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24204.1</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
|
||||
|
|
@ -209,7 +209,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.10.0-release-24177-07</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.10.0-release-24203-04</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-alpha.1.24058.10</MicrosoftExtensionsLoggingConsoleVersion>
|
||||
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.24176.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
|
||||
</PropertyGroup>
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
<XamarinMacOSWorkloadManifestVersion>14.2.9088-net9-p1</XamarinMacOSWorkloadManifestVersion>
|
||||
<XamarinTvOSWorkloadManifestVersion>17.2.9088-net9-p1</XamarinTvOSWorkloadManifestVersion>
|
||||
<!-- Workloads from dotnet/emsdk -->
|
||||
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.4.24176.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.4.24201.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
|
||||
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
|
||||
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
|
||||
<EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
|
||||
|
|
|
|||
|
|
@ -91,10 +91,10 @@ jobs:
|
|||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: $(DncEngPublicBuildPool)
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
|
||||
container: ${{ parameters.container }}
|
||||
${{ if eq(parameters.agentOs, 'Darwin') }}:
|
||||
pool:
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@ jobs:
|
|||
|
||||
- ${{ if eq(parameters.targetOS, 'windows') }}:
|
||||
- script: |
|
||||
call $(sourcesPath)\build.cmd -ci -cleanWhileBuilding -prepareMachine ${{ parameters.extraProperties }}
|
||||
call $(sourcesPath)\build.cmd -ci -cleanWhileBuilding -prepareMachine /p:TargetOS=${{ parameters.targetOS }} /p:TargetArchitecture=${{ parameters.targetArchitecture }} ${{ parameters.extraProperties }}
|
||||
displayName: Build
|
||||
|
||||
- ${{ else }}:
|
||||
|
|
|
|||
|
|
@ -78,12 +78,12 @@ stages:
|
|||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: CentOSStream8_Online_MsftSdk
|
||||
buildName: CentOSStream9_Online_MsftSdk
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.centOSStream8Container }}
|
||||
container: ${{ variables.centOSStream9Container }}
|
||||
buildFromArchive: false # 🚫
|
||||
buildSourceOnly: true # ✅
|
||||
enablePoison: false # 🚫
|
||||
|
|
@ -99,12 +99,12 @@ stages:
|
|||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: CentOSStream8_Online_CurrentSourceBuiltSdk
|
||||
buildName: CentOSStream9_Online_CurrentSourceBuiltSdk
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.centOSStream8Container }}
|
||||
container: ${{ variables.centOSStream9Container }}
|
||||
buildFromArchive: false # 🚫
|
||||
buildSourceOnly: true # ✅
|
||||
enablePoison: false # 🚫
|
||||
|
|
@ -113,7 +113,7 @@ stages:
|
|||
runTests: true # ✅
|
||||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: false # 🚫
|
||||
reuseBuildArtifactsFrom: CentOSStream8_Online_MsftSdk
|
||||
reuseBuildArtifactsFrom: centOSStream9_Online_MsftSdk
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
|
|
@ -155,80 +155,6 @@ stages:
|
|||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: false # 🚫
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: CentOSStream8_Offline_MsftSdk
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.centOSStream8Container }}
|
||||
buildFromArchive: true # ✅
|
||||
buildSourceOnly: true # ✅
|
||||
enablePoison: false # 🚫
|
||||
excludeOmniSharpTests: true # ✅
|
||||
runOnline: false # 🚫
|
||||
runTests: true # ✅
|
||||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: false # 🚫
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: CentOSStream8_Online_PreviousSourceBuiltSdk
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
artifactsRid: centos.8-x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.centOSStream8Container }}
|
||||
buildFromArchive: false # 🚫
|
||||
buildSourceOnly: true # ✅
|
||||
enablePoison: false # 🚫
|
||||
excludeOmniSharpTests: true # ✅
|
||||
runOnline: true # ✅
|
||||
runTests: true # ✅
|
||||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: true # ✅
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: CentOSStream8_Offline_PreviousSourceBuiltSdk
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
artifactsRid: centos.8-x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.centOSStream8Container }}
|
||||
buildFromArchive: false # 🚫
|
||||
buildSourceOnly: true # ✅
|
||||
enablePoison: false # 🚫
|
||||
excludeOmniSharpTests: true # ✅
|
||||
runOnline: false # 🚫
|
||||
runTests: true # ✅
|
||||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: true # ✅
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: CentOSStream8_Mono_Offline_MsftSdk
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.centOSStream8Container }}
|
||||
buildFromArchive: true # ✅
|
||||
buildSourceOnly: true # ✅
|
||||
enablePoison: false # 🚫
|
||||
excludeOmniSharpTests: true # ✅
|
||||
runOnline: false # 🚫
|
||||
runTests: true # ✅
|
||||
useMonoRuntime: true # ✅
|
||||
withPreviousSDK: false # 🚫
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
|
|
@ -247,6 +173,62 @@ stages:
|
|||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: false # 🚫
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: CentOSStream9_Online_PreviousSourceBuiltSdk
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
artifactsRid: centos.9-x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.centOSStream9Container }}
|
||||
buildFromArchive: false # 🚫
|
||||
buildSourceOnly: true # ✅
|
||||
enablePoison: false # 🚫
|
||||
excludeOmniSharpTests: false # 🚫
|
||||
runOnline: true # ✅
|
||||
runTests: true # ✅
|
||||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: true # ✅
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: CentOSStream9_Offline_PreviousSourceBuiltSdk
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
artifactsRid: centos.9-x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.centOSStream9Container }}
|
||||
buildFromArchive: false # 🚫
|
||||
buildSourceOnly: true # ✅
|
||||
enablePoison: false # 🚫
|
||||
excludeOmniSharpTests: true # ✅
|
||||
runOnline: false # 🚫
|
||||
runTests: true # ✅
|
||||
useMonoRuntime: false # 🚫
|
||||
withPreviousSDK: true # ✅
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
buildName: CentOSStream9_Mono_Offline_MsftSdk
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: x64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.centOSStream9Container }}
|
||||
buildFromArchive: true # ✅
|
||||
buildSourceOnly: true # ✅
|
||||
enablePoison: false # 🚫
|
||||
excludeOmniSharpTests: true # ✅
|
||||
runOnline: false # 🚫
|
||||
runTests: true # ✅
|
||||
useMonoRuntime: true # ✅
|
||||
withPreviousSDK: false # 🚫
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
|
||||
|
|
@ -700,19 +682,55 @@ stages:
|
|||
targetOS: linux
|
||||
targetArchitecture: x64
|
||||
|
||||
# Mariner x64->non-x64 builds are currently broken, see https://github.com/dotnet/source-build/issues/3698
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
buildName: Mariner_x64_Cross
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: arm
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.marinerArmCrossContainer }}
|
||||
crossRootFs: '/crossrootfs/arm'
|
||||
targetOS: linux
|
||||
targetArchitecture: arm
|
||||
|
||||
# - template: ../jobs/vmr-build.yml
|
||||
# parameters:
|
||||
# buildName: Mariner_x64_Cross
|
||||
# isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
# vmrBranch: ${{ variables.VmrBranch }}
|
||||
# architecture: arm64
|
||||
# pool: ${{ parameters.pool_Linux }}
|
||||
# container: ${{ variables.marinerArm64CrossContainer }}
|
||||
# crossRootFs: '/crossrootfs/arm64'
|
||||
# targetOS: linux
|
||||
# targetArchitecture: arm64
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
buildName: Mariner_x64_Cross_Mono
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: arm
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.marinerArmCrossContainer }}
|
||||
crossRootFs: '/crossrootfs/arm'
|
||||
useMonoRuntime: true
|
||||
targetOS: linux
|
||||
targetArchitecture: arm
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
buildName: Mariner_x64_Cross
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: arm64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.marinerArm64CrossContainer }}
|
||||
crossRootFs: '/crossrootfs/arm64'
|
||||
targetOS: linux
|
||||
targetArchitecture: arm64
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
buildName: Mariner_x64_Cross_Mono
|
||||
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
|
||||
vmrBranch: ${{ variables.VmrBranch }}
|
||||
architecture: arm64
|
||||
pool: ${{ parameters.pool_Linux }}
|
||||
container: ${{ variables.marinerArm64CrossContainer }}
|
||||
crossRootFs: '/crossrootfs/arm64'
|
||||
useMonoRuntime: true
|
||||
targetOS: linux
|
||||
targetArchitecture: arm64
|
||||
|
||||
- template: ../jobs/vmr-build.yml
|
||||
parameters:
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@ variables:
|
|||
|
||||
- name: alpine319Container
|
||||
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
|
||||
- name: centOSStream8Container
|
||||
value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
|
||||
- name: centOSStream9Container
|
||||
value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
|
||||
- name: fedora39Container
|
||||
|
|
@ -24,6 +22,8 @@ variables:
|
|||
value: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-arm64
|
||||
- name: marinerX64CrossContainer
|
||||
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64
|
||||
- name: marinerArmCrossContainer
|
||||
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
|
||||
- name: marinerArm64CrossContainer
|
||||
value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64
|
||||
- name: androidCrossContainer
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@
|
|||
"cmake": "latest"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24201.3",
|
||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24201.3",
|
||||
"Microsoft.Build.NoTargets": "3.7.0"
|
||||
}
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24203.1",
|
||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24203.1",
|
||||
"Microsoft.Build.NoTargets": "3.7.0" }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -169,10 +169,10 @@
|
|||
<KeysDir>$([MSBuild]::NormalizeDirectory('$(PrereqsDir)', 'keys'))</KeysDir>
|
||||
<PrereqsPackagesDir>$([MSBuild]::NormalizeDirectory('$(PrereqsDir)', 'packages'))</PrereqsPackagesDir>
|
||||
|
||||
<!-- When SB mode, the initial arcade is unzipped to the "ArcadeBootstrapPackage" dir.
|
||||
When running in VBPOC, the bootstrap package is the arcade restored at the beginning of the build. -->
|
||||
<ArcadeBootstrapPackageDir Condition="'$(DotNetBuildSourceOnly)' == 'true'">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'ArcadeBootstrapPackage'))</ArcadeBootstrapPackageDir>
|
||||
<ArcadeBootstrapPackageDir Condition="'$(DotNetBuildSourceOnly)' != 'true'">$(NuGetPackageRoot)</ArcadeBootstrapPackageDir>
|
||||
<!-- When SB mode, the initial toolsets are unzipped to the "BootstrapPackages" dir.
|
||||
When running in non-source-build, the bootstrap package is the one restored at the beginning of the build. -->
|
||||
<BootstrapPackagesDir Condition="'$(DotNetBuildSourceOnly)' == 'true'">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'BootstrapPackages'))</BootstrapPackagesDir>
|
||||
<BootstrapPackagesDir Condition="'$(DotNetBuildSourceOnly)' != 'true'">$(NuGetPackageRoot)</BootstrapPackagesDir>
|
||||
|
||||
<VSMSBuildSdkResolversDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'toolset', 'VSSdkResolvers'))</VSMSBuildSdkResolversDir>
|
||||
<IntermediateSymbolsRootDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsObjDir)', 'Symbols'))</IntermediateSymbolsRootDir>
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ function Build {
|
|||
if [ "$test" == "true" ]; then
|
||||
"$CLI_ROOT/dotnet" msbuild "$scriptroot/build.proj" -bl:"$scriptroot/artifacts/log/$configuration/BuildTests.binlog" -flp:"LogFile=$scriptroot/artifacts/log/$configuration/BuildTests.log" -clp:v=m $properties
|
||||
else
|
||||
"$CLI_ROOT/dotnet" msbuild "$scriptroot/eng/tools/init-build.proj" -bl:"$scriptroot/artifacts/log/$configuration/BuildMSBuildSdkResolver.binlog" -flp:LogFile="$scriptroot/artifacts/log/$configuration/BuildMSBuildSdkResolver.log" /t:ExtractToolPackage,BuildMSBuildSdkResolver $properties
|
||||
"$CLI_ROOT/dotnet" msbuild "$scriptroot/eng/tools/init-build.proj" -bl:"$scriptroot/artifacts/log/$configuration/BuildMSBuildSdkResolver.binlog" -flp:LogFile="$scriptroot/artifacts/log/$configuration/BuildMSBuildSdkResolver.log" /t:ExtractToolsetPackages,BuildMSBuildSdkResolver $properties
|
||||
|
||||
# kill off the MSBuild server so that on future invocations we pick up our custom SDK Resolver
|
||||
"$CLI_ROOT/dotnet" build-server shutdown
|
||||
|
|
@ -351,20 +351,46 @@ if [[ "$sourceOnly" == "true" ]]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Extract toolset packages
|
||||
|
||||
# Ensure that by default, the bootstrap version of the toolset SDK is used. Source-build infra
|
||||
# projects use bootstrap toolset SDKs, and would fail to find it in the build. The repo
|
||||
# projects overwrite this so that they use the source-built toolset SDK instad.
|
||||
|
||||
# 1. Microsoft.DotNet.Arcade.Sdk
|
||||
arcadeSdkLine=$(grep -m 1 'MicrosoftDotNetArcadeSdkVersion' "$packageVersionsPath")
|
||||
versionPattern="<MicrosoftDotNetArcadeSdkVersion>(.*)</MicrosoftDotNetArcadeSdkVersion>"
|
||||
if [[ $arcadeSdkLine =~ $versionPattern ]]; then
|
||||
arcadeSdkPattern="<MicrosoftDotNetArcadeSdkVersion>(.*)</MicrosoftDotNetArcadeSdkVersion>"
|
||||
if [[ $arcadeSdkLine =~ $arcadeSdkPattern ]]; then
|
||||
export ARCADE_BOOTSTRAP_VERSION=${BASH_REMATCH[1]}
|
||||
|
||||
# Ensure that by default, the bootstrap version of the Arcade SDK is used. Source-build infra
|
||||
# projects use bootstrap Arcade SDK, and would fail to find it in the build. The repo
|
||||
# projects overwrite this so that they use the source-built Arcade SDK instad.
|
||||
export SOURCE_BUILT_SDK_ID_ARCADE=Microsoft.DotNet.Arcade.Sdk
|
||||
export SOURCE_BUILT_SDK_VERSION_ARCADE=$ARCADE_BOOTSTRAP_VERSION
|
||||
export SOURCE_BUILT_SDK_DIR_ARCADE=$packagesRestoredDir/ArcadeBootstrapPackage/microsoft.dotnet.arcade.sdk/$ARCADE_BOOTSTRAP_VERSION
|
||||
export SOURCE_BUILT_SDK_DIR_ARCADE=$packagesRestoredDir/BootstrapPackages/microsoft.dotnet.arcade.sdk/$ARCADE_BOOTSTRAP_VERSION
|
||||
fi
|
||||
|
||||
echo "Found bootstrap SDK $SDK_VERSION, bootstrap Arcade $ARCADE_BOOTSTRAP_VERSION"
|
||||
# 2. Microsoft.Build.NoTargets
|
||||
notargetsSdkLine=$(grep -m 1 'Microsoft.Build.NoTargets' "$scriptroot/global.json")
|
||||
notargetsSdkPattern="\"Microsoft\.Build\.NoTargets\" *: *\"(.*)\""
|
||||
if [[ $notargetsSdkLine =~ $notargetsSdkPattern ]]; then
|
||||
export NOTARGETS_BOOTSTRAP_VERSION=${BASH_REMATCH[1]}
|
||||
|
||||
export SOURCE_BUILT_SDK_ID_NOTARGETS=Microsoft.Build.NoTargets
|
||||
export SOURCE_BUILT_SDK_VERSION_NOTARGETS=$NOTARGETS_BOOTSTRAP_VERSION
|
||||
export SOURCE_BUILT_SDK_DIR_NOTARGETS=$packagesRestoredDir/BootstrapPackages/microsoft.build.notargets/$NOTARGETS_BOOTSTRAP_VERSION
|
||||
fi
|
||||
|
||||
# 3. Microsoft.Build.Traversal
|
||||
traversalSdkLine=$(grep -m 1 'Microsoft.Build.Traversal' "$scriptroot/global.json")
|
||||
traversalSdkPattern="\"Microsoft\.Build\.Traversal\" *: *\"(.*)\""
|
||||
if [[ $traversalSdkLine =~ $traversalSdkPattern ]]; then
|
||||
export TRAVERSAL_BOOTSTRAP_VERSION=${BASH_REMATCH[1]}
|
||||
|
||||
export SOURCE_BUILT_SDK_ID_TRAVERSAL=Microsoft.Build.Traversal
|
||||
export SOURCE_BUILT_SDK_VERSION_TRAVERSAL=$TRAVERSAL_BOOTSTRAP_VERSION
|
||||
export SOURCE_BUILT_SDK_DIR_TRAVERSAL=$packagesRestoredDir/BootstrapPackages/microsoft.build.traversal/$TRAVERSAL_BOOTSTRAP_VERSION
|
||||
fi
|
||||
|
||||
echo "Found bootstrap versions: SDK $SDK_VERSION, Arcade $ARCADE_BOOTSTRAP_VERSION, NoTargets $NOTARGETS_BOOTSTRAP_VERSION and Traversal $TRAVERSAL_BOOTSTRAP_VERSION"
|
||||
fi
|
||||
|
||||
Build
|
||||
|
|
|
|||
|
|
@ -15,13 +15,28 @@
|
|||
<MSBuild Projects="$(RepoProjectsDir)$(RootRepo).proj" Targets="WritePrebuiltUsageData;ReportPrebuiltUsage" />
|
||||
</Target>
|
||||
|
||||
<!-- After building, repackage symbols into a single tarball. -->
|
||||
<Target Name="RepackageSymbols"
|
||||
<!--
|
||||
Determine symbols tarball names and discover all intermediate symbols,
|
||||
to be used as inputs and outputs of symbols repackaging targets.
|
||||
-->
|
||||
<Target Name="DetermineSymbolsTargetsInputsAndOutputs"
|
||||
AfterTargets="Build"
|
||||
DependsOnTargets="DetermineSourceBuiltSdkVersion">
|
||||
<PropertyGroup>
|
||||
<UnifiedSymbolsTarball>$(ArtifactsAssetsDir)dotnet-symbols-all-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension)</UnifiedSymbolsTarball>
|
||||
<SdkSymbolsTarball>$(ArtifactsAssetsDir)dotnet-symbols-sdk-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension)</SdkSymbolsTarball>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<IntermediateSymbol Include="$(IntermediateSymbolsRootDir)**/*" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- After building, repackage symbols into a single tarball. -->
|
||||
<Target Name="RepackageSymbols"
|
||||
AfterTargets="Build"
|
||||
DependsOnTargets="DetermineSymbolsTargetsInputsAndOutputs"
|
||||
Inputs="@(IntermediateSymbol)"
|
||||
Outputs="$(UnifiedSymbolsTarball)">
|
||||
|
||||
<MakeDir Directories="$([System.IO.Path]::GetDirectoryName('$(UnifiedSymbolsTarball)'))" />
|
||||
<Exec Command="tar --numeric-owner -czf $(UnifiedSymbolsTarball) *"
|
||||
|
|
@ -34,10 +49,10 @@
|
|||
<UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.CreateSdkSymbolsLayout" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" />
|
||||
<Target Name="CreateSdkSymbolsTarball"
|
||||
AfterTargets="Build"
|
||||
DependsOnTargets="RepackageSymbols">
|
||||
DependsOnTargets="RepackageSymbols"
|
||||
Inputs="@(IntermediateSymbol);$(SdkTarballPath)"
|
||||
Outputs="$(SdkSymbolsTarball)">
|
||||
<PropertyGroup>
|
||||
<SdkSymbolsTarball>$(ArtifactsAssetsDir)dotnet-symbols-sdk-$(SourceBuiltSdkVersion)-$(TargetRid)$(ArchiveExtension)</SdkSymbolsTarball>
|
||||
|
||||
<IntermediateSdkSymbolsLayout>$(BaseIntermediateOutputPath)SdkSymbols</IntermediateSdkSymbolsLayout>
|
||||
<IntermediateSdkLayout>$(BaseIntermediateOutputPath)Sdk</IntermediateSdkLayout>
|
||||
</PropertyGroup>
|
||||
|
|
@ -55,7 +70,6 @@
|
|||
|
||||
<Message Importance="High" Text="Packaged sdk symbols in '$(SdkSymbolsTarball)'" />
|
||||
|
||||
<RemoveDir Directories="$(IntermediateSymbolsRootDir)" />
|
||||
<RemoveDir Directories="$(IntermediateSdkSymbolsLayout)" />
|
||||
<RemoveDir Directories="$(IntermediateSdkLayout)" />
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -61,6 +61,13 @@ extends:
|
|||
image: 1es-windows-2022
|
||||
os: windows
|
||||
|
||||
codeql:
|
||||
compiled:
|
||||
enabled: true
|
||||
# Runs analysis in the SDL stage and not every job
|
||||
# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/sdlanalysis/codeql#improving-codeql-performance
|
||||
runSourceLanguagesInSourceAnalysis: true
|
||||
|
||||
baseline:
|
||||
baselineFile: $(Build.SourcesDirectory)\.config\guardian\.gdnbaselines
|
||||
|
||||
|
|
|
|||
|
|
@ -21,20 +21,13 @@ parameters:
|
|||
default: ' '
|
||||
|
||||
jobs:
|
||||
- template: templates/jobs/sdk-diff-tests.yml
|
||||
parameters:
|
||||
buildName: CentOSStream8_Offline_MsftSdk
|
||||
targetRid: centos.8-x64
|
||||
architecture: x64
|
||||
dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}
|
||||
includeArtifactsSize: true
|
||||
|
||||
- template: templates/jobs/sdk-diff-tests.yml
|
||||
parameters:
|
||||
buildName: CentOSStream9_Offline_MsftSdk
|
||||
targetRid: centos.9-x64
|
||||
architecture: x64
|
||||
dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}
|
||||
includeArtifactsSize: true
|
||||
|
||||
- template: templates/jobs/sdk-diff-tests.yml
|
||||
parameters:
|
||||
|
|
@ -104,7 +104,7 @@ jobs:
|
|||
exit 1
|
||||
fi
|
||||
|
||||
eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore
|
||||
eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore
|
||||
|
||||
echo "##vso[task.setvariable variable=Platform]$platform"
|
||||
echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name"
|
||||
|
|
@ -115,7 +115,7 @@ jobs:
|
|||
|
||||
- script: >
|
||||
.dotnet/dotnet test
|
||||
$(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
|
||||
$(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
|
||||
--filter "Category=SdkContent"
|
||||
--logger:'trx;LogFileName=$(Agent.JobName)_SDKDiffTests.trx'
|
||||
--logger:'console;verbosity=detailed'
|
||||
|
|
@ -143,7 +143,6 @@ jobs:
|
|||
find artifacts/ -type f -name "BuildTests*.binlog" -exec cp {} --parents -t ${targetFolder} \;
|
||||
find artifacts/ -type f -name "BuildTests*.log" -exec cp {} --parents -t ${targetFolder} \;
|
||||
find artifacts/ -type f -name "Build.binlog" -exec cp {} --parents -t ${targetFolder} \;
|
||||
cd "$(Build.SourcesDirectory)/src/SourceBuild/content"
|
||||
find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \;
|
||||
find test/ -type f -name "Updated*.diff" -exec cp {} --parents -t ${targetFolder} \;
|
||||
find test/ -type f -name "Updated*.txt" -exec cp {} --parents -t ${targetFolder} \;
|
||||
|
|
@ -164,7 +163,7 @@ jobs:
|
|||
inputs:
|
||||
testRunner: vSTest
|
||||
testResultsFiles: '*.trx'
|
||||
searchFolder: $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults
|
||||
searchFolder: $(Build.SourcesDirectory)/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults
|
||||
mergeTestResults: true
|
||||
publishRunAttachments: true
|
||||
testRunTitle: $(Agent.JobName)
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
BuildMSBuildSdkResolver;
|
||||
RestoreUnifiedBuildValidationTests;
|
||||
BuildLeakDetection;
|
||||
ExtractToolPackage;
|
||||
ExtractToolsetPackages;
|
||||
GenerateRootFs;
|
||||
PoisonPrebuiltPackages" />
|
||||
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
<!-- 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"
|
||||
DependsOnTargets="ExtractToolPackage;BuildMSBuildSdkResolver"
|
||||
DependsOnTargets="ExtractToolsetPackages;BuildMSBuildSdkResolver"
|
||||
Inputs="$(MSBuildProjectFullPath)"
|
||||
Outputs="$(BaseIntermediateOutputPath)BuildLeakDetection.complete">
|
||||
<MSBuild Projects="tasks\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection\Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.csproj"
|
||||
|
|
@ -133,18 +133,24 @@
|
|||
Condition="'$(TargetArchitecture)' == 'armel'" />
|
||||
</Target>
|
||||
|
||||
<!-- Extract Arcade prebuilt package into the bootstrap folder and prepare it. -->
|
||||
<Target Name="ExtractToolPackage"
|
||||
<!-- Extract toolset packages into the bootstrap folder -->
|
||||
<Target Name="ExtractToolsetPackages"
|
||||
Condition="'$(DotNetBuildSourceOnly)' == 'true'"
|
||||
DependsOnTargets="UnpackTarballs"
|
||||
Inputs="$(MSBuildProjectFullPath)"
|
||||
Outputs="$(BaseIntermediateOutputPath)ExtractToolPackage.complete">
|
||||
<Unzip SourceFiles="$(PrebuiltSourceBuiltPackagesPath)Microsoft.DotNet.Arcade.Sdk.$(ARCADE_BOOTSTRAP_VERSION).nupkg"
|
||||
DestinationFolder="$(ArcadeBootstrapPackageDir)microsoft.dotnet.arcade.sdk/$(ARCADE_BOOTSTRAP_VERSION)/"
|
||||
Outputs="$(BaseIntermediateOutputPath)ExtractToolsetPackages.complete">
|
||||
<ItemGroup>
|
||||
<ToolsetPackage Include="Microsoft.DotNet.Arcade.Sdk" SourceFolder="$(PrebuiltSourceBuiltPackagesPath)" Version="$(ARCADE_BOOTSTRAP_VERSION)" />
|
||||
<ToolsetPackage Include="Microsoft.Build.NoTargets" SourceFolder="$(ReferencePackagesDir)" Version="$(NOTARGETS_BOOTSTRAP_VERSION)" />
|
||||
<ToolsetPackage Include="Microsoft.Build.Traversal" SourceFolder="$(ReferencePackagesDir)" Version="$(TRAVERSAL_BOOTSTRAP_VERSION)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Unzip SourceFiles="%(ToolsetPackage.SourceFolder)%(ToolsetPackage.Identity).%(ToolsetPackage.Version).nupkg"
|
||||
DestinationFolder="$(BootstrapPackagesDir)$([System.String]::Copy('%(ToolsetPackage.Identity)').ToLowerInvariant())/%(ToolsetPackage.Version)"
|
||||
SkipUnchangedFiles="true" />
|
||||
|
||||
<MakeDir Directories="$(BaseIntermediateOutputPath)" />
|
||||
<Touch Files="$(BaseIntermediateOutputPath)ExtractToolPackage.complete" AlwaysCreate="true">
|
||||
<Touch Files="$(BaseIntermediateOutputPath)ExtractToolsetPackages.complete" AlwaysCreate="true">
|
||||
<Output TaskParameter="TouchedFiles" ItemName="FileWrites" />
|
||||
</Touch>
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
### --no-prebuilts Exclude the download of the prebuilts archive
|
||||
### --no-sdk Exclude the download of the .NET SDK
|
||||
### --artifacts-rid The RID of the previously source-built artifacts archive to download
|
||||
### Default is centos.8-x64
|
||||
### Default is centos.9-x64
|
||||
### --runtime-source-feed URL of a remote server or a local directory, from which SDKs and
|
||||
### runtimes can be downloaded
|
||||
### --runtime-source-feed-key Key for accessing the above server, if necessary
|
||||
|
|
@ -35,7 +35,7 @@ function print_help () {
|
|||
}
|
||||
|
||||
# SB prep default arguments
|
||||
defaultArtifactsRid='centos.8-x64'
|
||||
defaultArtifactsRid='centos.9-x64'
|
||||
|
||||
# Binary Tooling default arguments
|
||||
defaultDotnetSdk="$REPO_ROOT/.dotnet"
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
<NuGetConfigFile Condition="'$(OriginalNuGetConfigFile)' != ''">$(BaseIntermediateOutputPath)$([System.IO.Path]::GetFileName('$(OriginalNuGetConfigFile)'))</NuGetConfigFile>
|
||||
|
||||
<RepoAssetManifestsDir>$([MSBuild]::NormalizeDirectory('$(AssetManifestsIntermediateDir)', '$(RepositoryName)'))</RepoAssetManifestsDir>
|
||||
<IntermediateSymbolsRepoDir>$([MSBuild]::NormalizeDirectory('$(IntermediateSymbolsRootDir)', '$(RepositoryName)'))</IntermediateSymbolsRepoDir>
|
||||
|
||||
<SourceBuiltSdksDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'source-built-sdks'))</SourceBuiltSdksDir>
|
||||
|
||||
|
|
@ -54,13 +55,6 @@
|
|||
<ArcadeBootstrapVersion>$([MSBuild]::ValueOrDefault('$(ARCADE_BOOTSTRAP_VERSION)', '$(ArcadeSdkVersion)'))</ArcadeBootstrapVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
|
||||
<!-- Get Microsoft.Build.NoTargets and Microsoft.Build.Traversal versions from VMR's global.json -->
|
||||
<VMRGlobalJsonContents>$([System.IO.File]::ReadAllText($(RepoRoot)global.json))</VMRGlobalJsonContents>
|
||||
<NoTargetsSdkVersion>$([System.Text.RegularExpressions.Regex]::Match($(VMRGlobalJsonContents), '"Microsoft.Build.NoTargets": "([^"]*)"').Groups.get_Item(1))</NoTargetsSdkVersion>
|
||||
<TraversalSdkVersion>$([System.Text.RegularExpressions.Regex]::Match($(VMRGlobalJsonContents), '"Microsoft.Build.Traversal": "([^"]*)"').Groups.get_Item(1))</TraversalSdkVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(BuildOS)' == 'windows'">
|
||||
<FlagParameterPrefix>-</FlagParameterPrefix>
|
||||
<ArcadeFalseBoolBuildArg>0</ArcadeFalseBoolBuildArg>
|
||||
|
|
@ -99,6 +93,7 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
|
||||
<BuildArgs>$(BuildArgs) /p:SourceBuiltSymbolsDir=$(IntermediateSymbolsRepoDir)</BuildArgs>
|
||||
<BuildArgs>$(BuildArgs) /p:ArcadeBuildFromSource=true</BuildArgs>
|
||||
<BuildArgs>$(BuildArgs) /p:DotNetBuildSourceOnly=true</BuildArgs>
|
||||
<BuildArgs>$(BuildArgs) /p:PreviouslySourceBuiltNupkgCacheDir="$(PrebuiltSourceBuiltPackagesPath)"</BuildArgs>
|
||||
|
|
@ -201,7 +196,7 @@
|
|||
|
||||
<SourceBuiltSdkOverride Include="@(ArcadeSdkOverride)"
|
||||
Version="$(ArcadeBootstrapVersion)"
|
||||
Location="$(ArcadeBootstrapPackageDir)microsoft.dotnet.arcade.sdk/$(ArcadeBootstrapVersion)"
|
||||
Location="$(BootstrapPackagesDir)microsoft.dotnet.arcade.sdk/$(ArcadeBootstrapVersion)"
|
||||
Condition="'$(UseBootstrapArcade)' == 'true'" />
|
||||
|
||||
<!-- When not bootstrapping, use the just-built versions. -->
|
||||
|
|
@ -221,8 +216,8 @@
|
|||
RestoreConfigFile property. MSBuild uses NuGetSdkResolver to restore missing SDKs, which doesn't honor
|
||||
RestoreConfigFile property and uses NuGet.config file from repo's root which has online feeds.
|
||||
-->
|
||||
<NoTargetsSdkOverride Include="Microsoft.Build.NoTargets" Group="NOTARGETS" Version="$(NoTargetsSdkVersion)" />
|
||||
<TraversalSdkOverride Include="Microsoft.Build.Traversal" Group="TRAVERSAL" Version="$(TraversalSdkVersion)" />
|
||||
<NoTargetsSdkOverride Include="Microsoft.Build.NoTargets" Group="NOTARGETS" Version="$(NOTARGETS_BOOTSTRAP_VERSION)" />
|
||||
<TraversalSdkOverride Include="Microsoft.Build.Traversal" Group="TRAVERSAL" Version="$(TRAVERSAL_BOOTSTRAP_VERSION)" />
|
||||
<SourceBuiltSdkOverride Include="@(NoTargetsSdkOverride)" Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(RepositoryName)' != 'source-build-reference-packages'" />
|
||||
<SourceBuiltSdkOverride Include="@(TraversalSdkOverride)" Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(RepositoryName)' != 'source-build-reference-packages'" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -24,8 +24,6 @@
|
|||
<PackageReportDataFile>$(PackageReportDir)prebuilt-usage.xml</PackageReportDataFile>
|
||||
<ProjectAssetsJsonArchiveFile>$(PackageReportDir)all-project-assets-json-files.zip</ProjectAssetsJsonArchiveFile>
|
||||
<ProdConManifestFile>$(PackageReportDir)prodcon-build.xml</ProdConManifestFile>
|
||||
|
||||
<IntermediateSymbolsRepoDir>$(IntermediateSymbolsRootDir)$(RepositoryName)</IntermediateSymbolsRepoDir>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Returns the repository references of this project and all the projects this project references, recursively -->
|
||||
|
|
@ -538,34 +536,6 @@
|
|||
</Touch>
|
||||
</Target>
|
||||
|
||||
<Target Name="DiscoverSymbolsArchiveFile"
|
||||
Condition="'$(DotNetBuildSourceOnly)' == 'true' and
|
||||
'$(IsUtilityProject)' != 'true'">
|
||||
<PropertyGroup>
|
||||
<RepoAssetsSymbolsArchive>$(ArtifactsAssetsSymbolsDir)Symbols.$(RepositoryName)$(ArchiveExtension)</RepoAssetsSymbolsArchive>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<RepoSymbolsArchive Include="$(RepoAssetsSymbolsArchive)" Condition="Exists('$(RepoAssetsSymbolsArchive)')" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="ExtractSymbolsArchiveFile"
|
||||
DependsOnTargets="RepoBuild;DiscoverSymbolsArchiveFile"
|
||||
Condition="'$(DotNetBuildSourceOnly)' == 'true' and
|
||||
'$(IsUtilityProject)' != 'true' and
|
||||
'@(RepoSymbolsArchive)' != ''"
|
||||
Inputs="@(RepoSymbolsArchive)"
|
||||
Outputs="$(IntermediateSymbolsRepoDir)">
|
||||
|
||||
<Error Text="There must only be a single repository symbols archive file. Found: @(RepoSymbolsArchive)"
|
||||
Condition="@(RepoSymbolsArchive->Count()) > 1" />
|
||||
|
||||
<!-- Extract repo symbols tarball -->
|
||||
<MakeDir Directories="$(IntermediateSymbolsRepoDir)" />
|
||||
<Exec Command="tar -xzf %(RepoSymbolsArchive.Identity) -C $(IntermediateSymbolsRepoDir)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="Build"
|
||||
DependsOnTargets="
|
||||
BuildRepoReferences;
|
||||
|
|
@ -573,8 +543,6 @@
|
|||
LogRepoArtifacts;
|
||||
CopyInnerBuildRestoredPackages;
|
||||
ExtractToolPackage;
|
||||
DiscoverSymbolsArchiveFile;
|
||||
ExtractSymbolsArchiveFile;
|
||||
CleanupRepo" />
|
||||
|
||||
<UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.UsageReport.WritePackageUsageData" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" />
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
<BuildArgs>$(BuildArgs) /p:PackageRid=$(TargetRid)</BuildArgs>
|
||||
<BuildArgs>$(BuildArgs) /p:AssetManifestOS=$(TargetOS)</BuildArgs>
|
||||
<BuildArgs>$(BuildArgs) /p:PlatformName=$(TargetArch)</BuildArgs>
|
||||
<BuildArgs>$(BuildArgs) /p:PlatformName=$(TargetArchitecture)</BuildArgs>
|
||||
<BuildArgs>$(BuildArgs) /p:ForceBuildManifestOnly=true</BuildArgs>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ src/sdk/THIRD-PARTY-NOTICES.TXT|unknown-license-reference
|
|||
|
||||
# False positive
|
||||
src/source-build-externals/src/abstractions-xunit/README.md|free-unknown
|
||||
src/source-build-externals/src/application-insights-2.22.0/NETCORE/ThirdPartyNotices.txt|unknown
|
||||
src/source-build-externals/src/application-insights/NETCORE/ThirdPartyNotices.txt|unknown
|
||||
src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/benchmark/Microsoft.IdentityModel.Benchmarks/CreateTokenTests.cs|proprietary-license
|
||||
src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/src/Microsoft.IdentityModel.JsonWebTokens/JsonClaimValueTypes.cs|proprietary-license
|
||||
src/source-build-externals/src/azure-activedirectory-identitymodel-extensions-for-dotnet/src/Microsoft.IdentityModel.Tokens.Saml/Saml/ClaimProperties.cs|proprietary-license
|
||||
|
|
@ -219,9 +219,6 @@ src/source-build-externals/src/xunit/README.md|free-unknown
|
|||
src/source-build-externals/src/xunit/src/xunit.assert/Asserts/README.md|free-unknown
|
||||
src/source-build-externals/src/xunit/xunit.sln|json
|
||||
|
||||
# A patch which removes the license usage but contains references to the removed license as part of the patch reference lines
|
||||
src/source-build-externals/patches/application-insights-2.22.0/0002-Remove-WebGrease-from-TPN-2816.patch
|
||||
|
||||
# Scanner is identifying the https://github.com/SixLabors/ImageSharp/blob/master/LICENSE license as unknown. But this license is not applicable because we're
|
||||
# relying on the Spectre.Console distribution.
|
||||
# See https://github.com/dotnet/dotnet/blob/c6a7278fbb7d79fa3d1f386ef0dc8474043ed06c/src/source-build-externals/src/spectre-console/README.md?plain=1#L104
|
||||
|
|
|
|||
|
|
@ -90,7 +90,6 @@ Microsoft.Css.Parser.x.y.z.nupkg: 52964
|
|||
Microsoft.Deployment.DotNet.Releases.x.y.z.nupkg: 79562
|
||||
Microsoft.Diagnostics.NETCore.Client.x.y.z.nupkg: 63738
|
||||
Microsoft.DiaSymReader.x.y.z-1.nupkg: 57796
|
||||
Microsoft.DiaSymReader.x.y.z-2.nupkg: 57817
|
||||
Microsoft.DiaSymReader.x.y.z.nupkg: 57811
|
||||
Microsoft.DotNet.ApiCompat.Task.x.y.z.nupkg: 1280207
|
||||
Microsoft.DotNet.Arcade.Sdk.x.y.z.nupkg: 876107
|
||||
|
|
@ -2504,6 +2503,7 @@ sdk/x.y.z/Microsoft.NET.Sdk.WorkloadManifestReader.dll: 253952
|
|||
sdk/x.y.z/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll: 48128
|
||||
sdk/x.y.z/Microsoft.NET.StringTools.dll: 41984
|
||||
sdk/x.y.z/Microsoft.NETCoreSdk.BundledCliTools.props: 599
|
||||
sdk/x.y.z/Microsoft.NETCoreSdk.BundledMSBuildInformation.props: 985
|
||||
sdk/x.y.z/Microsoft.NETCoreSdk.BundledVersions.props: 50236
|
||||
sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.props: 11741
|
||||
sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.targets: 9313
|
||||
|
|
@ -3083,7 +3083,7 @@ sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_7_recommen
|
|||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_8_all_warnaserror.globalconfig: 29701
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_8_all.globalconfig: 27752
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_8_default_warnaserror.globalconfig: 3272
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_8_default.globalconfig: 829
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_8_default.globalconfig: 1179
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_8_minimum_warnaserror.globalconfig: 11410
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_8_minimum.globalconfig: 9089
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_8_none_warnaserror.globalconfig: 16373
|
||||
|
|
@ -3432,8 +3432,8 @@ sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelperformance
|
|||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelperformance_7_recommended.globalconfig: 4987
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelperformance_8_all_warnaserror.globalconfig: 6211
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelperformance_8_all.globalconfig: 6040
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelperformance_8_default_warnaserror.globalconfig: 726
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelperformance_8_default.globalconfig: 461
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelperformance_8_default_warnaserror.globalconfig: 1009
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelperformance_8_default.globalconfig: 623
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelperformance_8_minimum_warnaserror.globalconfig: 4702
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelperformance_8_minimum.globalconfig: 4497
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelperformance_8_none_warnaserror.globalconfig: 5165
|
||||
|
|
@ -3483,7 +3483,7 @@ sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelreliability
|
|||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelreliability_8_all_warnaserror.globalconfig: 2098
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelreliability_8_all.globalconfig: 1304
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelreliability_8_default_warnaserror.globalconfig: 1154
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelreliability_8_default.globalconfig: 340
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelreliability_8_default.globalconfig: 430
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelreliability_8_minimum_warnaserror.globalconfig: 1712
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelreliability_8_minimum.globalconfig: 910
|
||||
sdk/x.y.z/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevelreliability_8_none_warnaserror.globalconfig: 1694
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"files": [
|
||||
{
|
||||
"path": "src/application-insights-2.22.0/LOGGING/ThirdPartyNotices.txt",
|
||||
"path": "src/application-insights/LOGGING/ThirdPartyNotices.txt",
|
||||
"detected_license_expression": "unknown AND apache-2.0 AND mit AND bsd-new"
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
# This list is processed using FileSystemName.MatchesSimpleExpression
|
||||
#
|
||||
# Format
|
||||
# {msft|sb},<path> [# comment]
|
||||
# msft = Microsoft built SDK
|
||||
# ub = Unified Build SDK
|
||||
#
|
||||
# Examples
|
||||
# 'folder/*' matches 'folder/' and 'folder/abc'
|
||||
# 'folder/?*' matches 'folder/abc' but not 'folder/'
|
||||
|
||||
# These files are Windows specific and should not be in the Microsoft build
|
||||
msft,./sdk/x.y.z/Containers/containerize/*
|
||||
msft,./sdk/x.y.z/Containers/tasks/net472/*
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff --git a/msftSdkFiles.txt b/ubSdkFiles.txt
|
||||
index ------------
|
||||
--- a/msftSdkFiles.txt
|
||||
+++ b/ubSdkFiles.txt
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
|
||||
+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CodeDom.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll
|
||||
./sdk/x.y.z/Microsoft.NET.StringTools.dll
|
||||
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledCliTools.props
|
||||
-./sdk/x.y.z/Microsoft.NETCoreSdk.BundledMSBuildInformation.props
|
||||
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledVersions.props
|
||||
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.props
|
||||
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.targets
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff --git a/msftSdkFiles.txt b/ubSdkFiles.txt
|
||||
index ------------
|
||||
--- a/msftSdkFiles.txt
|
||||
+++ b/ubSdkFiles.txt
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
|
||||
+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CodeDom.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll
|
||||
./sdk/x.y.z/Microsoft.NET.StringTools.dll
|
||||
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledCliTools.props
|
||||
-./sdk/x.y.z/Microsoft.NETCoreSdk.BundledMSBuildInformation.props
|
||||
./sdk/x.y.z/Microsoft.NETCoreSdk.BundledVersions.props
|
||||
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.props
|
||||
./sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.targets
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
diff --git a/msftSdkFiles.txt b/ubSdkFiles.txt
|
||||
index ------------
|
||||
--- a/msftSdkFiles.txt
|
||||
+++ b/ubSdkFiles.txt
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Workspaces.MSBuild.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.DiaSymReader.dll
|
||||
-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
||||
-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.Extensions.Logging.Abstractions.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.VisualStudio.Setup.Configuration.Interop.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/
|
||||
-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll
|
||||
-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll
|
||||
+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CodeDom.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll
|
||||
@@ ------------ @@
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Runtime.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.TypedParts.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Configuration.ConfigurationManager.dll
|
||||
-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Diagnostics.EventLog.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.MetadataLoadContext.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Resources.Extensions.dll
|
||||
-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.Pkcs.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll
|
||||
-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.Xml.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll
|
||||
./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/
|
||||
|
|
@ -0,0 +1,111 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Wed, 3 Apr 2024 21:23:27 +0000
|
||||
Subject: [PATCH] Copy repo symbols to intermediates
|
||||
|
||||
Backport: https://github.com/dotnet/arcade/pull/14681
|
||||
---
|
||||
.../tools/Publish.proj | 8 -----
|
||||
.../tools/SourceBuild/AfterSourceBuild.proj | 2 +-
|
||||
.../SourceBuild/SourceBuildArcade.targets | 35 +++++++++++++++----
|
||||
3 files changed, 29 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
|
||||
index 43fadc322..bec1a4963 100644
|
||||
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
|
||||
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
|
||||
@@ -118,14 +118,6 @@
|
||||
<ItemsToSignPostBuild Include="@(SymbolPackagesToGenerate->'%(Filename)%(Extension)')" Condition="'$(PostBuildSign)' == 'true'" />
|
||||
</ItemGroup>
|
||||
|
||||
- <!-- Include Symbols.<repo>.tar.gz, if running in inner source-only build -->
|
||||
- <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildInnerRepo)' == 'true'">
|
||||
- <UnifiedSymbolsPackage Include="$(ArtifactsNonShippingPackagesDir)Symbols.*.tar.gz" />
|
||||
- <Artifact Include="@(UnifiedSymbolsPackage)"
|
||||
- RelativeBlobPath="Symbols/%(Filename)%(Extension)"
|
||||
- IsShipping="false" />
|
||||
- </ItemGroup>
|
||||
-
|
||||
<!--
|
||||
If a symbol package doesn't exist yet we assume that the regular package contains Portable PDBs.
|
||||
Such packages can act as symbol packages since they have the same structure.
|
||||
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/AfterSourceBuild.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/AfterSourceBuild.proj
|
||||
index c2ba0644b..6a1fd449d 100644
|
||||
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/AfterSourceBuild.proj
|
||||
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/AfterSourceBuild.proj
|
||||
@@ -14,7 +14,7 @@
|
||||
<Target Name="AfterSourceBuildInnerBuild"
|
||||
Condition="('$(ArcadeInnerBuildFromSource)' == 'true' or '$(DotNetBuildInnerRepo)' == 'true') and
|
||||
'$(DotNetBuildOrchestrator)' == 'true'"
|
||||
- DependsOnTargets="CreateRepoSymbolsArchive;ClearPreviousSBRP" />
|
||||
+ DependsOnTargets="CopyRepoSymbolsToIntermediates;ClearPreviousSBRP" />
|
||||
|
||||
<Target Name="ClearPreviousSBRP"
|
||||
Condition="'$(GitHubRepositoryName)' == 'source-build-reference-packages'">
|
||||
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcade.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcade.targets
|
||||
index 41817c3a9..f06d33095 100644
|
||||
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcade.targets
|
||||
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcade.targets
|
||||
@@ -159,20 +159,20 @@
|
||||
|
||||
Conditioning out for Windows as the tar execution below doesn't work cross-plat.
|
||||
-->
|
||||
+
|
||||
<Target Name="CreateRepoSymbolsArchive"
|
||||
+ Condition="'$(OS)' != 'Windows_NT' and ('$(DotNetBuildFromSourceFlavor)' == 'Product' or '$(DotNetBuildOrchestrator)' == 'true' or '$(SupplementalIntermediateNupkgCategory)' == '$(SymbolsIntermediateNupkgCategory)')"
|
||||
+ DependsOnTargets="$(CreateRepoSymbolsArchiveDependsOn);
|
||||
+ DiscoverRepoSymbols;
|
||||
+ PackageRepoSymbols"/>
|
||||
+
|
||||
+ <Target Name="DiscoverRepoSymbols"
|
||||
Condition="'$(OS)' != 'Windows_NT' and ('$(DotNetBuildFromSourceFlavor)' == 'Product' or '$(DotNetBuildOrchestrator)' == 'true' or '$(SupplementalIntermediateNupkgCategory)' == '$(SymbolsIntermediateNupkgCategory)')"
|
||||
DependsOnTargets="$(CreateRepoSymbolsArchiveDependsOn)">
|
||||
<PropertyGroup>
|
||||
<SymbolsRoot>$(CurrentRepoSourceBuildArtifactsDir)</SymbolsRoot>
|
||||
<!-- Fall back to repo root for source-build-externals or repos that don't have the regular SymbolsRoot as defined above -->
|
||||
<SymbolsRoot Condition="!Exists('$(SymbolsRoot)') or '$(GitHubRepositoryName)' == 'source-build-externals'">$(RepoRoot)</SymbolsRoot>
|
||||
- <SymbolsArchiveLocation>$(CurrentRepoSourceBuildArtifactsNonShippingPackagesDir)</SymbolsArchiveLocation>
|
||||
- <SymbolsArchiveLocation Condition="'$(GitHubRepositoryName)' == 'nuget-client' and '$(PackageOutputPath)' != ''">$([MSBuild]::EnsureTrailingSlash('$(PackageOutputPath)'))</SymbolsArchiveLocation>
|
||||
- <SymbolsList>$([MSBuild]::NormalizePath('$(SymbolsArchiveLocation)', 'symbols.lst'))</SymbolsList>
|
||||
- <SymbolsArchivePrefix>Symbols.</SymbolsArchivePrefix>
|
||||
- <!-- $(Version) and $(TargetRid) are only available when target is executed as part of intermediate package creation. -->
|
||||
- <SymbolsArchiveSuffix Condition="'$(CreateIntermediatePackage)' == 'true'">.$(Version).$(TargetRid)</SymbolsArchiveSuffix>
|
||||
- <SymbolsArchiveFile>$(SymbolsArchiveLocation)$(SymbolsArchivePrefix)$(GitHubRepositoryName)$(SymbolsArchiveSuffix)$(ArchiveExtension)</SymbolsArchiveFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -181,6 +181,20 @@
|
||||
<RelativePath>$([MSBuild]::MakeRelative($(SymbolsRoot), %(FullPath)))</RelativePath>
|
||||
</AbsoluteSymbolPath>
|
||||
</ItemGroup>
|
||||
+ </Target>
|
||||
+
|
||||
+ <Target Name="PackageRepoSymbols"
|
||||
+ Condition="'$(OS)' != 'Windows_NT' and ('$(DotNetBuildFromSourceFlavor)' == 'Product' or '$(DotNetBuildOrchestrator)' == 'true' or '$(SupplementalIntermediateNupkgCategory)' == '$(SymbolsIntermediateNupkgCategory)')"
|
||||
+ DependsOnTargets="$(CreateRepoSymbolsArchiveDependsOn);DiscoverRepoSymbols">
|
||||
+ <PropertyGroup>
|
||||
+ <SymbolsArchiveLocation>$(CurrentRepoSourceBuildArtifactsNonShippingPackagesDir)</SymbolsArchiveLocation>
|
||||
+ <SymbolsArchiveLocation Condition="'$(GitHubRepositoryName)' == 'nuget-client' and '$(PackageOutputPath)' != ''">$([MSBuild]::EnsureTrailingSlash('$(PackageOutputPath)'))</SymbolsArchiveLocation>
|
||||
+ <SymbolsList>$([MSBuild]::NormalizePath('$(SymbolsArchiveLocation)', 'symbols.lst'))</SymbolsList>
|
||||
+ <SymbolsArchivePrefix>Symbols.</SymbolsArchivePrefix>
|
||||
+ <!-- $(Version) and $(TargetRid) are only available when target is executed as part of intermediate package creation. -->
|
||||
+ <SymbolsArchiveSuffix Condition="'$(CreateIntermediatePackage)' == 'true'">.$(Version).$(TargetRid)</SymbolsArchiveSuffix>
|
||||
+ <SymbolsArchiveFile>$(SymbolsArchiveLocation)$(SymbolsArchivePrefix)$(GitHubRepositoryName)$(SymbolsArchiveSuffix)$(ArchiveExtension)</SymbolsArchiveFile>
|
||||
+ </PropertyGroup>
|
||||
|
||||
<WriteLinesToFile
|
||||
File="$(SymbolsList)"
|
||||
@@ -203,6 +217,13 @@
|
||||
<Delete Files="$(SymbolsList)" Condition="Exists($(SymbolsList))" />
|
||||
</Target>
|
||||
|
||||
+ <Target Name="CopyRepoSymbolsToIntermediates"
|
||||
+ DependsOnTargets="DiscoverRepoSymbols">
|
||||
+ <MakeDir Directories="$(SourceBuiltSymbolsDir)" />
|
||||
+ <Copy
|
||||
+ SourceFiles="@(AbsoluteSymbolPath)"
|
||||
+ DestinationFolder="$(SourceBuiltSymbolsDir)%(RecursiveDir)" />
|
||||
+ </Target>
|
||||
<!--
|
||||
This target can be removed once we enable standard repo assets manifests and SB orchestrator
|
||||
starts using it - https://github.com/dotnet/source-build/issues/3970
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
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)
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
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);
|
||||
|
|
@ -376,6 +376,7 @@
|
|||
@(Net80ILCompilerSupportedRids);
|
||||
linux-arm;
|
||||
linux-musl-arm;
|
||||
win-x86;
|
||||
" />
|
||||
|
||||
<!-- The subset of ILCompiler target RIDs that are officially supported. Should be a subset of
|
||||
|
|
@ -409,6 +410,7 @@
|
|||
linux-musl-x64;
|
||||
linux-musl-arm;
|
||||
linux-musl-arm64;
|
||||
win-x86;
|
||||
win-x64;
|
||||
win-arm64;
|
||||
browser-wasm;
|
||||
|
|
|
|||
Loading…
Reference in a new issue