Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (dotnet#110477)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/arcade build 20241205.6

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24605.6

* Set roll forward for cdac-build-tool

* Bump NetCoreAppToolCurrent to net10.0

* Fix CustomEventSource test

dotnet#110001 updated annotations on
EventSource. This adjusts the expected preserved members to match.

* Fix tests with Type checks

With https://github.com/dotnet/runtime/pull/106497/files,
object.GetType is no longer an internalcall. This means we no longer
mark the ctor of the return type, System.Type, so the type check
removal optimization is kicking in where it didn't before.

* Update dependencies from https://github.com/dotnet/arcade build 20241206.6

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24606.6

* Disable nativeAOT components for win-x86 temporarily

* Update baseline entries

* Bump AspNetCoreAppCurrent

* Update pinned package versions

* Update sdk dependencies

* Fix path to WebAssembly build task

* Update dependencies from https://github.com/dotnet/arcade build 20241210.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24610.1

* Build XUnitLogChecker as SingleFile when we can't AOT it. Our infra expects us to publish this with a host. Publishing as single file makes this a little easier (and keeps it as one file).

* Update SDK and remove obsolete condition

* Revert "Fix tests with Type checks"

This reverts commit 15a30ef.

* Fix illink tests

* Reapply "Fix tests with Type checks"

This reverts commit 7a8c1fb.

* Attempt 2

* Update dependencies from https://github.com/dotnet/arcade build 20241210.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24610.2

* Update sdk dependencies that are used for workloads tests

* Based on dotnet#93693, Update Wasm.Build.Tests and Wasi.Build.Tests for net10.0

* Change disable condition as hybrid globalization in the browser has been disabled and the test fails due to this condition being false now.

* Update dependencies from https://github.com/dotnet/arcade build 20241211.4

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24611.4

* Use feature switch to disable DataSet xml serialization related tests

* Update dependencies from https://github.com/dotnet/arcade build 20241212.4

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24612.4

* Workload fixes and improvements

* Remove runtimes-windows from workload manifest, it is unused

* Add net10 entries in workloads.csproj

* Fix mistakes in net8 workload manifest

* Update emsdk

* Fix msbuild conditions

* Update dependencies from https://github.com/dotnet/arcade build 20241213.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 10.0.0-beta.24605.1 -> To Version 10.0.0-beta.24613.2

* Fix regex for runtime pack path to allow space

* Fix condition in WorkloadManifest.targets.in to actually match net10.0

* Fix net version in wasm templates

* Fix one more hardcoded net9.0

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
Co-authored-by: Sven Boemer <sbomer@gmail.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
  • Loading branch information
7 people authored Dec 16, 2024
1 parent b33f755 commit 373f048
Show file tree
Hide file tree
Showing 95 changed files with 1,127 additions and 443 deletions.
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@
<!-- when this is updated, make sure to keep $(_NetCoreAppToolCurrent)
in src/mono/wasm/build/WasmApp.LocalBuild.props
and in src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props in sync -->
<NetCoreAppToolCurrentVersion>9.0</NetCoreAppToolCurrentVersion>
<NetCoreAppToolCurrentVersion>10.0</NetCoreAppToolCurrentVersion>
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>

<AspNetCoreAppCurrentVersion>9.0</AspNetCoreAppCurrentVersion>
<AspNetCoreAppCurrentVersion>10.0</AspNetCoreAppCurrentVersion>
<AspNetCoreAppCurrent>net$(AspNetCoreAppCurrentVersion)</AspNetCoreAppCurrent>

<NetFrameworkMinimum>net462</NetFrameworkMinimum>
Expand Down
8 changes: 4 additions & 4 deletions eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.8.*" />

<!-- Allowed and pinned to major version due to https://github.com/dotnet/source-build/issues/3228 -->
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Runtime.linux-x64/*9.*" />
<UsagePattern IdentityGlob="*Microsoft.DotNet.ILCompiler/*9.*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*10.*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Runtime.linux-x64/*10.*" />
<UsagePattern IdentityGlob="*Microsoft.DotNet.ILCompiler/*10.*" />

<!-- Allowed and pinned to SDK version -->
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/*9.*" />
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/*10.*" />

<!-- This version is brought in transitively from NuGet.Packaging.6.2.4.
Once a newer version of NuGet.Packaging is referenced which has a
Expand Down
100 changes: 50 additions & 50 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@
<Sha>7f4a1466b958a6ac42953d72ae6ddaabb1149a78</Sha>
<SourceBuild RepoName="cecil" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.24575.2">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.24613.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>235d38cd586eeed59513cf865f4771914d654e4a</Sha>
<Sha>11e2cd6f4b4bd65b10692fbdc17f597fa79793c8</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="10.0.0-alpha.1.24575.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="10.0.0-alpha.1.24613.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>235d38cd586eeed59513cf865f4771914d654e4a</Sha>
<Sha>11e2cd6f4b4bd65b10692fbdc17f597fa79793c8</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<!-- Intermediate is necessary for source build. -->
Expand All @@ -84,87 +84,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.24605.1">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.24605.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.24571.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -348,9 +348,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>9fca69998474507f6515c1351efe027dbf194c87</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24605.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24613.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down Expand Up @@ -402,14 +402,14 @@
<Sha>86d60f7a00b0274a806a40afde8801a89d27e6bc</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-alpha.1.24480.5">
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-alpha.1.24610.7">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>9de571282093d76401a3f457a8e9f4427e088778</Sha>
<Sha>138afc2ac17650f5cc1cf46de85f12ea756c54e7</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="10.0.100-alpha.1.24480.5">
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="10.0.100-alpha.1.24610.7">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>9de571282093d76401a3f457a8e9f4427e088778</Sha>
<Sha>138afc2ac17650f5cc1cf46de85f12ea756c54e7</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
Expand Down
37 changes: 19 additions & 18 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<SdkBandVersion>$(MajorVersion).0.100</SdkBandVersion>
<PackageVersionNet9>9.0.0</PackageVersionNet9>
<PackageVersionNet8>8.0.8</PackageVersionNet8>
<PackageVersionNet7>7.0.20</PackageVersionNet7>
<PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet8)').Build),25))</PackageVersionNet6>
Expand Down Expand Up @@ -82,24 +83,24 @@
<PropertyGroup>
<StaticCsVersion>0.2.0</StaticCsVersion>
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24480.5</MicrosoftDotNetApiCompatTaskVersion>
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24610.7</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24605.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24605.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24605.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.24605.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24605.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.24605.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24605.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24605.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24605.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24613.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24613.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24613.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.24613.2</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24613.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.24613.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24613.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24613.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24613.2</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down Expand Up @@ -250,7 +251,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.0-alpha.1.24575.2</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>10.0.0-alpha.1.24613.1</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ steps:
portableBuildArgs=
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
fi
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
Expand Down
Loading

0 comments on commit 373f048

Please sign in to comment.