Skip to content

Commit 373f048

Browse files
dotnet-maestro[bot]akoeplingersbomerViktorHoferjkoritzinsky
authored
[main] Update dependencies from dotnet/arcade (#110477)
* 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 #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 #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 <[email protected]> Co-authored-by: Sven Boemer <[email protected]> Co-authored-by: Viktor Hofer <[email protected]> Co-authored-by: Jeremy Koritzinsky <[email protected]> Co-authored-by: Michal Strehovský <[email protected]>
1 parent b33f755 commit 373f048

File tree

95 files changed

+1127
-443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1127
-443
lines changed

‎Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@
105105
<!-- when this is updated, make sure to keep $(_NetCoreAppToolCurrent)
106106
in src/mono/wasm/build/WasmApp.LocalBuild.props
107107
and in src/mono/msbuild/apple/build/AppleBuild.LocalBuild.props in sync -->
108-
<NetCoreAppToolCurrentVersion>9.0</NetCoreAppToolCurrentVersion>
108+
<NetCoreAppToolCurrentVersion>10.0</NetCoreAppToolCurrentVersion>
109109
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
110110
<NetCoreAppCurrentToolTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)</NetCoreAppCurrentToolTargetFrameworkMoniker>
111111

112-
<AspNetCoreAppCurrentVersion>9.0</AspNetCoreAppCurrentVersion>
112+
<AspNetCoreAppCurrentVersion>10.0</AspNetCoreAppCurrentVersion>
113113
<AspNetCoreAppCurrent>net$(AspNetCoreAppCurrentVersion)</AspNetCoreAppCurrent>
114114

115115
<NetFrameworkMinimum>net462</NetFrameworkMinimum>

‎eng/SourceBuildPrebuiltBaseline.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis*/*4.8.*" />
1212

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

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

2121
<!-- This version is brought in transitively from NuGet.Packaging.6.2.4.
2222
Once a newer version of NuGet.Packaging is referenced which has a

‎eng/Version.Details.xml

+50-50
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@
6060
<Sha>7f4a1466b958a6ac42953d72ae6ddaabb1149a78</Sha>
6161
<SourceBuild RepoName="cecil" ManagedOnly="true" />
6262
</Dependency>
63-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.24575.2">
63+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.24613.1">
6464
<Uri>https://github.com/dotnet/emsdk</Uri>
65-
<Sha>235d38cd586eeed59513cf865f4771914d654e4a</Sha>
65+
<Sha>11e2cd6f4b4bd65b10692fbdc17f597fa79793c8</Sha>
6666
</Dependency>
6767
<!-- Intermediate is necessary for source build. -->
68-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="10.0.0-alpha.1.24575.2">
68+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="10.0.0-alpha.1.24613.1">
6969
<Uri>https://github.com/dotnet/emsdk</Uri>
70-
<Sha>235d38cd586eeed59513cf865f4771914d654e4a</Sha>
70+
<Sha>11e2cd6f4b4bd65b10692fbdc17f597fa79793c8</Sha>
7171
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7272
</Dependency>
7373
<!-- Intermediate is necessary for source build. -->
@@ -84,87 +84,87 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24605.1">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24613.2">
8888
<Uri>https://github.com/dotnet/arcade</Uri>
89-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
89+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
9090
</Dependency>
9191
<!-- Intermediate is necessary for source build. -->
92-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24605.1">
92+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24613.2">
9393
<Uri>https://github.com/dotnet/arcade</Uri>
94-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
94+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
9595
<SourceBuild RepoName="arcade" ManagedOnly="true" />
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24605.1">
97+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24613.2">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
99+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24605.1">
101+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24613.2">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
103+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24605.1">
105+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24613.2">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
107+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24605.1">
109+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24613.2">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
111+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.24605.1">
113+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.24613.2">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
115+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24605.1">
117+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24613.2">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
119+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.24605.1">
121+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.24613.2">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
123+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24605.1">
125+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.24613.2">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
127+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24605.1">
129+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.24613.2">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
131+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24605.1">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24613.2">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
135+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24605.1">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24613.2">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
139+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24605.1">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.24613.2">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
143+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24605.1">
145+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24613.2">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
147+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24605.1">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.24613.2">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
151+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24605.1">
153+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24613.2">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
155+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24605.1">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24613.2">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
159+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24605.1">
161+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.24613.2">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
163+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24605.1">
165+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.24613.2">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
167+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
168168
</Dependency>
169169
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.24571.1">
170170
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -348,9 +348,9 @@
348348
<Uri>https://github.com/dotnet/xharness</Uri>
349349
<Sha>9fca69998474507f6515c1351efe027dbf194c87</Sha>
350350
</Dependency>
351-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24605.1">
351+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.24613.2">
352352
<Uri>https://github.com/dotnet/arcade</Uri>
353-
<Sha>110749ff6e8a43fcd7c8f0bd74c5fcb0da3562ed</Sha>
353+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
354354
</Dependency>
355355
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">
356356
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -402,14 +402,14 @@
402402
<Sha>86d60f7a00b0274a806a40afde8801a89d27e6bc</Sha>
403403
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
404404
</Dependency>
405-
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-alpha.1.24480.5">
405+
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-alpha.1.24610.7">
406406
<Uri>https://github.com/dotnet/sdk</Uri>
407-
<Sha>9de571282093d76401a3f457a8e9f4427e088778</Sha>
407+
<Sha>138afc2ac17650f5cc1cf46de85f12ea756c54e7</Sha>
408408
</Dependency>
409409
<!-- Intermediate is necessary for source build. -->
410-
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="10.0.100-alpha.1.24480.5">
410+
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="10.0.100-alpha.1.24610.7">
411411
<Uri>https://github.com/dotnet/sdk</Uri>
412-
<Sha>9de571282093d76401a3f457a8e9f4427e088778</Sha>
412+
<Sha>138afc2ac17650f5cc1cf46de85f12ea756c54e7</Sha>
413413
<SourceBuild RepoName="sdk" ManagedOnly="true" />
414414
</Dependency>
415415
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.24462.2">

‎eng/Versions.props

+19-18
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<MinorVersion>0</MinorVersion>
88
<PatchVersion>0</PatchVersion>
99
<SdkBandVersion>$(MajorVersion).0.100</SdkBandVersion>
10+
<PackageVersionNet9>9.0.0</PackageVersionNet9>
1011
<PackageVersionNet8>8.0.8</PackageVersionNet8>
1112
<PackageVersionNet7>7.0.20</PackageVersionNet7>
1213
<PackageVersionNet6>6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet8)').Build),25))</PackageVersionNet6>
@@ -82,24 +83,24 @@
8283
<PropertyGroup>
8384
<StaticCsVersion>0.2.0</StaticCsVersion>
8485
<!-- SDK dependencies (also used in wasm build tests -->
85-
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24480.5</MicrosoftDotNetApiCompatTaskVersion>
86+
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24610.7</MicrosoftDotNetApiCompatTaskVersion>
8687
<!-- Arcade dependencies -->
87-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksFeedVersion>
88-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24605.1</MicrosoftDotNetCodeAnalysisVersion>
89-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24605.1</MicrosoftDotNetGenAPIVersion>
90-
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24605.1</MicrosoftDotNetGenFacadesVersion>
91-
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.24605.1</MicrosoftDotNetXUnitAssertVersion>
92-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24605.1</MicrosoftDotNetXUnitExtensionsVersion>
93-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.24605.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
94-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksArchivesVersion>
95-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksInstallersVersion>
96-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksPackagingVersion>
97-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
98-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksTemplatingVersion>
99-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24605.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
100-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24605.1</MicrosoftDotNetRemoteExecutorVersion>
101-
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24605.1</MicrosoftDotNetVersionToolsTasksVersion>
102-
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24605.1</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.24613.2</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.24613.2</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.24613.2</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.24613.2</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24613.2</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.24613.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.24613.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24613.2</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.24613.2</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.24613.2</MicrosoftDotNetPackageTestingVersion>
103104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
104105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
105106
<!-- NuGet dependencies -->
@@ -250,7 +251,7 @@
250251
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
251252
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-10_0_100_Transport
252253
-->
253-
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>10.0.0-alpha.1.24575.2</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>
254+
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>10.0.0-alpha.1.24613.1</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>
254255
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
255256
<!-- workloads -->
256257
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

‎eng/common/core-templates/steps/source-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ steps:
7878
7979
portableBuildArgs=
8080
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
81-
portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}'
81+
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
8282
fi
8383
8484
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \

0 commit comments

Comments
 (0)