mirror of https://github.com/dotnet/runtime
Merge a52b919c89
into 02596ba8d9
This commit is contained in:
commit
4d1ed16c97
|
@ -1,5 +1,5 @@
|
|||
<Dependencies>
|
||||
<Source Uri="https://github.com/dotnet/dotnet" Mapping="runtime" Sha="699b0116eb3df66c4dd7698af4f1cd24ac4547a3" BarId="275638" />
|
||||
<Source Uri="https://github.com/dotnet/dotnet" Mapping="runtime" Sha="6a953e76162f3f079405f80e28664fa51b136740" BarId="276981" />
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="10.0.0-preview.6.25302.1">
|
||||
<Uri>https://github.com/dotnet/icu</Uri>
|
||||
|
@ -41,91 +41,91 @@
|
|||
<Uri>https://github.com/dotnet/llvm-project</Uri>
|
||||
<Sha>da5dd054a531e6fea65643b7e754285b73eab433</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.CommandLine" Version="2.0.0-beta7.25367.101">
|
||||
<Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.100-preview.7.25367.101">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.100-preview.7.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.3-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.3-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.3-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.3-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25310.1">
|
||||
<Uri>https://github.com/dotnet/runtime-assets</Uri>
|
||||
|
@ -263,33 +263,33 @@
|
|||
<Uri>https://github.com/dotnet/llvm-project</Uri>
|
||||
<Sha>da5dd054a531e6fea65643b7e754285b73eab433</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25367.101">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="runtime.native.System.IO.Ports" Version="10.0.0-preview.7.25367.101">
|
||||
<Dependency Name="runtime.native.System.IO.Ports" Version="10.0.0-preview.7.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25367.101">
|
||||
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.7.25367.101">
|
||||
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.7.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25367.101">
|
||||
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Reflection.Metadata" Version="10.0.0-preview.7.25367.101">
|
||||
<Dependency Name="System.Reflection.Metadata" Version="10.0.0-preview.7.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25367.101">
|
||||
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="10.0.0-prerelease.25330.2">
|
||||
<Uri>https://github.com/dotnet/xharness</Uri>
|
||||
|
@ -303,9 +303,9 @@
|
|||
<Uri>https://github.com/dotnet/xharness</Uri>
|
||||
<Sha>feac80219b22c403d32df9b6bd61cbf78e1b9986</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25363.1">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
|
||||
|
@ -331,29 +331,29 @@
|
|||
<Uri>https://github.com/dotnet/runtime-assets</Uri>
|
||||
<Sha>385d085eb055cabeaed3dde958a900e7b31cf6ce</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-2.25367.101">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-2.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25367.101">
|
||||
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25367.101">
|
||||
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-2.25367.101">
|
||||
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-2.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25367.101">
|
||||
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-preview.7.25367.101">
|
||||
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-preview.7.25377.103">
|
||||
<Uri>https://github.com/dotnet/dotnet</Uri>
|
||||
<Sha>699b0116eb3df66c4dd7698af4f1cd24ac4547a3</Sha>
|
||||
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25363.1">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
|
||||
|
|
|
@ -35,17 +35,17 @@
|
|||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<!-- dotnet/roslyn-analyzers dependencies -->
|
||||
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25367.101</MicrosoftCodeAnalysisNetAnalyzersVersion>
|
||||
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25377.103</MicrosoftCodeAnalysisNetAnalyzersVersion>
|
||||
<!-- dotnet/roslyn dependencies -->
|
||||
<MicrosoftCodeAnalysisAnalyzersVersion>5.0.0-2.25367.101</MicrosoftCodeAnalysisAnalyzersVersion>
|
||||
<MicrosoftCodeAnalysisAnalyzersVersion>5.0.0-2.25377.103</MicrosoftCodeAnalysisAnalyzersVersion>
|
||||
<!--
|
||||
These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
|
||||
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
|
||||
they do not break the local dev experience.
|
||||
-->
|
||||
<MicrosoftCodeAnalysisCSharpVersion>5.0.0-2.25367.101</MicrosoftCodeAnalysisCSharpVersion>
|
||||
<MicrosoftCodeAnalysisVersion>5.0.0-2.25367.101</MicrosoftCodeAnalysisVersion>
|
||||
<MicrosoftNetCompilersToolsetVersion>5.0.0-2.25367.101</MicrosoftNetCompilersToolsetVersion>
|
||||
<MicrosoftCodeAnalysisCSharpVersion>5.0.0-2.25377.103</MicrosoftCodeAnalysisCSharpVersion>
|
||||
<MicrosoftCodeAnalysisVersion>5.0.0-2.25377.103</MicrosoftCodeAnalysisVersion>
|
||||
<MicrosoftNetCompilersToolsetVersion>5.0.0-2.25377.103</MicrosoftNetCompilersToolsetVersion>
|
||||
</PropertyGroup>
|
||||
<!--
|
||||
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
|
||||
|
@ -82,34 +82,34 @@
|
|||
<PropertyGroup>
|
||||
<StaticCsVersion>0.2.0</StaticCsVersion>
|
||||
<!-- SDK dependencies (also used in wasm build tests -->
|
||||
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.7.25367.101</MicrosoftDotNetApiCompatTaskVersion>
|
||||
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.7.25377.103</MicrosoftDotNetApiCompatTaskVersion>
|
||||
<!-- Arcade dependencies -->
|
||||
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25367.101</MicrosoftDotNetBuildTasksFeedVersion>
|
||||
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25367.101</MicrosoftDotNetCodeAnalysisVersion>
|
||||
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25367.101</MicrosoftDotNetGenAPIVersion>
|
||||
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25367.101</MicrosoftDotNetGenFacadesVersion>
|
||||
<MicrosoftDotNetXUnitAssertVersion>2.9.3-beta.25367.101</MicrosoftDotNetXUnitAssertVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25367.101</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.3-beta.25367.101</MicrosoftDotNetXUnitConsoleRunnerVersion>
|
||||
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25367.101</MicrosoftDotNetBuildTasksArchivesVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25367.101</MicrosoftDotNetBuildTasksInstallersVersion>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25367.101</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25367.101</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
|
||||
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25367.101</MicrosoftDotNetBuildTasksTemplatingVersion>
|
||||
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25367.101</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25367.101</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25367.101</MicrosoftDotNetPackageTestingVersion>
|
||||
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25367.101</MicrosoftDotNetXliffTasksVersion>
|
||||
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25377.103</MicrosoftDotNetBuildTasksFeedVersion>
|
||||
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25377.103</MicrosoftDotNetCodeAnalysisVersion>
|
||||
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25377.103</MicrosoftDotNetGenAPIVersion>
|
||||
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25377.103</MicrosoftDotNetGenFacadesVersion>
|
||||
<MicrosoftDotNetXUnitAssertVersion>2.9.3-beta.25377.103</MicrosoftDotNetXUnitAssertVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25377.103</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.3-beta.25377.103</MicrosoftDotNetXUnitConsoleRunnerVersion>
|
||||
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25377.103</MicrosoftDotNetBuildTasksArchivesVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25377.103</MicrosoftDotNetBuildTasksInstallersVersion>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25377.103</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25377.103</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
|
||||
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25377.103</MicrosoftDotNetBuildTasksTemplatingVersion>
|
||||
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25377.103</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25377.103</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25377.103</MicrosoftDotNetPackageTestingVersion>
|
||||
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25377.103</MicrosoftDotNetXliffTasksVersion>
|
||||
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
|
||||
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
|
||||
<!-- NuGet dependencies -->
|
||||
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
|
||||
<!-- Installer dependencies -->
|
||||
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25367.101</MicrosoftNETCoreAppRefVersion>
|
||||
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.7.25377.103</MicrosoftNETCoreAppRefVersion>
|
||||
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
|
||||
<!-- ILAsm dependencies -->
|
||||
<MicrosoftNETCoreILAsmVersion>10.0.0-preview.7.25367.101</MicrosoftNETCoreILAsmVersion>
|
||||
<MicrosoftNETSdkILVersion>10.0.0-preview.7.25367.101</MicrosoftNETSdkILVersion>
|
||||
<MicrosoftNETCoreILAsmVersion>10.0.0-preview.7.25377.103</MicrosoftNETCoreILAsmVersion>
|
||||
<MicrosoftNETSdkILVersion>10.0.0-preview.7.25377.103</MicrosoftNETSdkILVersion>
|
||||
<!-- Maintenance-Packages dependencies -->
|
||||
<MicrosoftBclHashCodeVersion>6.0.0</MicrosoftBclHashCodeVersion>
|
||||
<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
|
||||
|
@ -127,16 +127,16 @@
|
|||
<SystemDrawingCommonVersion>8.0.0</SystemDrawingCommonVersion>
|
||||
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
|
||||
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
|
||||
<SystemReflectionMetadataVersion>10.0.0-preview.7.25367.101</SystemReflectionMetadataVersion>
|
||||
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.7.25367.101</SystemReflectionMetadataLoadContextVersion>
|
||||
<SystemReflectionMetadataVersion>10.0.0-preview.7.25377.103</SystemReflectionMetadataVersion>
|
||||
<SystemReflectionMetadataLoadContextVersion>10.0.0-preview.7.25377.103</SystemReflectionMetadataLoadContextVersion>
|
||||
<SystemSecurityAccessControlVersion>6.0.0</SystemSecurityAccessControlVersion>
|
||||
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
|
||||
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
|
||||
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
|
||||
<SystemSecurityPermissionsVersion>7.0.0</SystemSecurityPermissionsVersion>
|
||||
<SystemTextJsonVersion>10.0.0-preview.7.25367.101</SystemTextJsonVersion>
|
||||
<SystemTextJsonVersion>10.0.0-preview.7.25377.103</SystemTextJsonVersion>
|
||||
<SystemThreadingAccessControlVersion>7.0.0</SystemThreadingAccessControlVersion>
|
||||
<runtimenativeSystemIOPortsVersion>10.0.0-preview.7.25367.101</runtimenativeSystemIOPortsVersion>
|
||||
<runtimenativeSystemIOPortsVersion>10.0.0-preview.7.25377.103</runtimenativeSystemIOPortsVersion>
|
||||
<!-- Keep toolset versions in sync with dotnet/msbuild and dotnet/sdk -->
|
||||
<MicrosoftBclAsyncInterfacesToolsetVersion>8.0.0</MicrosoftBclAsyncInterfacesToolsetVersion>
|
||||
<SystemBuffersToolsetVersion>4.5.1</SystemBuffersToolsetVersion>
|
||||
|
@ -179,7 +179,7 @@
|
|||
<!-- Not auto-updated. -->
|
||||
<MicrosoftDiaSymReaderVersion>2.0.0</MicrosoftDiaSymReaderVersion>
|
||||
<MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>
|
||||
<SystemCommandLineVersion>2.0.0-beta7.25367.101</SystemCommandLineVersion>
|
||||
<SystemCommandLineVersion>2.0.0-rc.1.25377.103</SystemCommandLineVersion>
|
||||
<TraceEventVersion>3.1.16</TraceEventVersion>
|
||||
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
|
||||
<NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
|
||||
|
@ -225,7 +225,7 @@
|
|||
<!-- Docs -->
|
||||
<MicrosoftPrivateIntellisenseVersion>9.0.0-preview-20241010.1</MicrosoftPrivateIntellisenseVersion>
|
||||
<!-- Mono Cecil -->
|
||||
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25367.101</MicrosoftDotNetCecilVersion>
|
||||
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25377.103</MicrosoftDotNetCecilVersion>
|
||||
<!-- ICU -->
|
||||
<MicrosoftNETCoreRuntimeICUTransportVersion>10.0.0-preview.6.25302.1</MicrosoftNETCoreRuntimeICUTransportVersion>
|
||||
<!-- MsQuic -->
|
||||
|
@ -257,7 +257,7 @@
|
|||
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
|
||||
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-10_0_100_Transport
|
||||
-->
|
||||
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>10.0.100-preview.7.25367.101</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>10.0.100-preview.7.25377.103</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>
|
||||
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
|
||||
<!-- workloads -->
|
||||
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
|
||||
|
|
|
@ -20,6 +20,7 @@ parameters:
|
|||
artifacts: ''
|
||||
enableMicrobuild: false
|
||||
enableMicrobuildForMacAndLinux: false
|
||||
microbuildUseESRP: true
|
||||
enablePublishBuildArtifacts: false
|
||||
enablePublishBuildAssets: false
|
||||
enablePublishTestResults: false
|
||||
|
@ -128,6 +129,7 @@ jobs:
|
|||
parameters:
|
||||
enableMicrobuild: ${{ parameters.enableMicrobuild }}
|
||||
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
|
||||
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
|
||||
continueOnError: ${{ parameters.continueOnError }}
|
||||
|
||||
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
|
||||
|
|
|
@ -83,7 +83,6 @@ jobs:
|
|||
- template: /eng/common/core-templates/jobs/source-build.yml
|
||||
parameters:
|
||||
is1ESPipeline: ${{ parameters.is1ESPipeline }}
|
||||
allCompletedJobId: Source_Build_Complete
|
||||
${{ each parameter in parameters.sourceBuildParameters }}:
|
||||
${{ parameter.key }}: ${{ parameter.value }}
|
||||
|
||||
|
@ -108,8 +107,6 @@ jobs:
|
|||
- ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}:
|
||||
- ${{ each job in parameters.jobs }}:
|
||||
- ${{ job.job }}
|
||||
- ${{ if eq(parameters.enableSourceBuild, true) }}:
|
||||
- Source_Build_Complete
|
||||
|
||||
runAsPublic: ${{ parameters.runAsPublic }}
|
||||
publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}
|
||||
|
|
|
@ -2,12 +2,6 @@ parameters:
|
|||
# This template adds arcade-powered source-build to CI. A job is created for each platform, as
|
||||
# well as an optional server job that completes when all platform jobs complete.
|
||||
|
||||
# The name of the "join" job for all source-build platforms. If set to empty string, the job is
|
||||
# not included. Existing repo pipelines can use this job depend on all source-build jobs
|
||||
# completing without maintaining a separate list of every single job ID: just depend on this one
|
||||
# server job. By default, not included. Recommended name if used: 'Source_Build_Complete'.
|
||||
allCompletedJobId: ''
|
||||
|
||||
# See /eng/common/core-templates/job/source-build.yml
|
||||
jobNamePrefix: 'Source_Build'
|
||||
|
||||
|
@ -31,16 +25,6 @@ parameters:
|
|||
|
||||
jobs:
|
||||
|
||||
- ${{ if ne(parameters.allCompletedJobId, '') }}:
|
||||
- job: ${{ parameters.allCompletedJobId }}
|
||||
displayName: Source-Build Complete
|
||||
pool: server
|
||||
dependsOn:
|
||||
- ${{ each platform in parameters.platforms }}:
|
||||
- ${{ parameters.jobNamePrefix }}_${{ platform.name }}
|
||||
- ${{ if eq(length(parameters.platforms), 0) }}:
|
||||
- ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }}
|
||||
|
||||
- ${{ each platform in parameters.platforms }}:
|
||||
- template: /eng/common/core-templates/job/source-build.yml
|
||||
parameters:
|
||||
|
|
|
@ -4,8 +4,16 @@ parameters:
|
|||
# Enable install tasks for MicroBuild on Mac and Linux
|
||||
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
|
||||
enableMicrobuildForMacAndLinux: false
|
||||
# Determines whether the ESRP service connection information should be passed to the signing plugin.
|
||||
# This overlaps with _SignType to some degree. We only need the service connection for real signing.
|
||||
# It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place.
|
||||
# Doing so will cause the service connection to be authorized for the pipeline, which isn't allowed and won't work for non-prod.
|
||||
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
|
||||
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
|
||||
microbuildUseESRP: true
|
||||
# Location of the MicroBuild output folder
|
||||
microBuildOutputFolder: '$(Build.SourcesDirectory)'
|
||||
|
||||
continueOnError: false
|
||||
|
||||
steps:
|
||||
|
@ -21,19 +29,37 @@ steps:
|
|||
workingDirectory: ${{ parameters.microBuildOutputFolder }}
|
||||
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
|
||||
|
||||
- script: |
|
||||
REM Check if ESRP is disabled while SignType is real
|
||||
if /I "${{ parameters.microbuildUseESRP }}"=="false" if /I "$(_SignType)"=="real" (
|
||||
echo Error: ESRP must be enabled when SignType is real.
|
||||
exit /b 1
|
||||
)
|
||||
displayName: 'Validate ESRP usage (Windows)'
|
||||
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'))
|
||||
- script: |
|
||||
# Check if ESRP is disabled while SignType is real
|
||||
if [ "${{ parameters.microbuildUseESRP }}" = "false" ] && [ "$(_SignType)" = "real" ]; then
|
||||
echo "Error: ESRP must be enabled when SignType is real."
|
||||
exit 1
|
||||
fi
|
||||
displayName: 'Validate ESRP usage (Non-Windows)'
|
||||
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
|
||||
|
||||
- task: MicroBuildSigningPlugin@4
|
||||
displayName: Install MicroBuild plugin
|
||||
inputs:
|
||||
signType: $(_SignType)
|
||||
zipSources: false
|
||||
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
|
||||
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
|
||||
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
|
||||
useEsrpCli: true
|
||||
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
|
||||
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
|
||||
${{ else }}:
|
||||
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
|
||||
${{ if eq(parameters.microbuildUseESRP, true) }}:
|
||||
${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
|
||||
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
|
||||
useEsrpCli: true
|
||||
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
|
||||
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
|
||||
${{ else }}:
|
||||
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
|
||||
env:
|
||||
TeamName: $(_TeamName)
|
||||
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
|
||||
|
|
|
@ -414,7 +414,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
|
|||
|
||||
# Locate Visual Studio installation or download x-copy msbuild.
|
||||
$vsInfo = LocateVisualStudio $vsRequirements
|
||||
if ($vsInfo -ne $null) {
|
||||
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
|
||||
# Ensure vsInstallDir has a trailing slash
|
||||
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
|
||||
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
"dotnet": "10.0.100-preview.7.25322.101"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.101",
|
||||
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25367.101",
|
||||
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25367.101",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25377.103",
|
||||
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25377.103",
|
||||
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25377.103",
|
||||
"Microsoft.Build.NoTargets": "3.7.0",
|
||||
"Microsoft.Build.Traversal": "3.4.0",
|
||||
"Microsoft.NET.Sdk.IL": "10.0.0-preview.7.25367.101"
|
||||
"Microsoft.NET.Sdk.IL": "10.0.0-preview.7.25377.103"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue