Skip to content

Commit dbeb51b

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/android-clr-host-local
* main: (31 commits) More native AOT Pri-1 test tree bring up (dotnet#111994) Fix BigInteger outerloop test (dotnet#111841) JIT: Run 3-opt once across all regions (dotnet#111989) JIT: Check for profile consistency throughout JIT backend (dotnet#111684) [JIT] Add legacy extended EVEX encoding and EVEX.ND/NF feature to x64 emitter backend (dotnet#108796) [iOS][globalization] Fix IndexOf on empty strings on iOS to return -1 (dotnet#111898) System.Speech: Use intellisense xml from dotnet-api-docs (dotnet#111983) [mono][mini] Disable inlining if we encounter class initialization failure (dotnet#111754) [main] Update dependencies from dotnet/roslyn (dotnet#111946) Update dependencies from https://github.com/dotnet/arcade build 20250129.2 (dotnet#111996) Try changing the ICustomQueryInterface implementation to always return NotHandled instead of Failed to defer back to the ComWrappers impl. (dotnet#111978) Combined dependency update (dotnet#111852) Replace OPTIMIZE_FOR_SIZE with feature switch (dotnet#111743) Fix failed assertion 'FPbased == FPbased2' (dotnet#111787) Add remark to `ConditionalSelect` (dotnet#111945) JIT: fix try region cloning when try is nested in a handler (dotnet#111975) Use IRootFunctions in Tensor.StdDev (dotnet#110641) Remove zlib dependencies from Docker containers (dotnet#111939) Avoid `Unsafe.As` for `Memory<T>` and `ReadOnlyMemory<T>` conversion (dotnet#111023) Cleanup membarrier portability (dotnet#111943) ...
2 parents 3ff6056 + 586e891 commit dbeb51b

File tree

162 files changed

+4525
-1363
lines changed

Some content is hidden

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

162 files changed

+4525
-1363
lines changed

‎.devcontainer/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
2424
liblttng-ust-dev \
2525
libssl-dev \
2626
libkrb5-dev \
27-
zlib1g-dev \
2827
ninja-build \
2928
tzdata

‎.devcontainer/android/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
2121
liblttng-ust-dev \
2222
libssl-dev \
2323
libkrb5-dev \
24-
zlib1g-dev \
2524
ninja-build \
26-
zlib1g-dev \
2725
ninja-build \
2826
openjdk-17-jdk \
2927
pulseaudio

‎.devcontainer/wasm-multiThreaded/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
2424
liblttng-ust-dev \
2525
libssl-dev \
2626
libkrb5-dev \
27-
zlib1g-dev \
2827
ninja-build
2928

3029
SHELL ["/bin/bash", "-c"]

‎.devcontainer/wasm/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
2323
liblttng-ust-dev \
2424
libssl-dev \
2525
libkrb5-dev \
26-
zlib1g-dev \
2726
ninja-build
2827

2928
SHELL ["/bin/bash", "-c"]

‎.github/workflows/check-no-merge-label.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: check-no-merge-label
2+
3+
permissions:
4+
pull-requests: read
5+
6+
on:
7+
pull_request:
8+
types: [opened, edited, reopened, labeled, unlabeled, synchronize]
9+
branches:
10+
- 'main'
11+
- 'release/**'
12+
13+
jobs:
14+
check-labels:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Check 'NO-MERGE' label
18+
run: |
19+
echo "Merging permission is disabled when the 'NO-MERGE' label is applied."
20+
if [ "${{ contains(github.event.pull_request.labels.*.name, 'NO-MERGE') }}" = "false" ]; then
21+
exit 0
22+
else
23+
echo "::error:: The 'NO-MERGE' label was applied to the PR. Merging is disabled."
24+
exit 1
25+
fi

‎.github/workflows/check-service-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- name: Check 'Servicing-approved' label
1717
run: |
18-
echo "Merging permission is enabled for servicing PRs when the `Servicing-approved` label is applied."
18+
echo "Merging permission is enabled for servicing PRs when the 'Servicing-approved' label is applied."
1919
if [ "${{ contains(github.event.pull_request.labels.*.name, 'Servicing-approved') }}" = "true" ]; then
2020
exit 0
2121
else

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
- src/mono/msbuild/apple/build/AppleBuild.targets
6464
- src/installer/pkg/sfx/bundle/shared-framework-distribution-template-x64.xml
6565
- src/installer/pkg/sfx/bundle/shared-framework-distribution-template-arm64.xml
66-
- src/tasks/AotCompilerTask/MonoAOTCompiler.props
66+
- src/mono/msbuild/common/MonoAOTCompiler.props
6767
- src/tasks/AppleAppBuilder/Xcode.cs
6868
- src/tasks/MobileBuildTasks/Apple/AppleProject.cs
6969
- https://github.com/dotnet/sdk repo > src/Installer/redist-installer/targets/GeneratePKG.targets

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<UsagePattern IdentityGlob="*Microsoft.DotNet.ILCompiler/*10.*" />
1717

1818
<!-- Allowed and pinned to SDK version -->
19+
<UsagePattern IdentityGlob="Microsoft.DotNet.ApiCompat.Task/*10.*" />
1920
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/*10.*" />
2021

2122
<!-- This version is brought in transitively from NuGet.Packaging.6.2.4.

‎eng/Version.Details.xml

Lines changed: 108 additions & 114 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
4545
they do not break the local dev experience.
4646
-->
47-
<MicrosoftCodeAnalysisCSharpVersion>4.14.0-1.25077.5</MicrosoftCodeAnalysisCSharpVersion>
48-
<MicrosoftCodeAnalysisVersion>4.14.0-1.25077.5</MicrosoftCodeAnalysisVersion>
49-
<MicrosoftNetCompilersToolsetVersion>4.14.0-1.25077.5</MicrosoftNetCompilersToolsetVersion>
47+
<MicrosoftCodeAnalysisCSharpVersion>4.14.0-2.25079.2</MicrosoftCodeAnalysisCSharpVersion>
48+
<MicrosoftCodeAnalysisVersion>4.14.0-2.25079.2</MicrosoftCodeAnalysisVersion>
49+
<MicrosoftNetCompilersToolsetVersion>4.14.0-2.25079.2</MicrosoftNetCompilersToolsetVersion>
5050
</PropertyGroup>
5151
<!--
5252
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
@@ -83,33 +83,33 @@
8383
<PropertyGroup>
8484
<StaticCsVersion>0.2.0</StaticCsVersion>
8585
<!-- SDK dependencies (also used in wasm build tests -->
86-
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24622.2</MicrosoftDotNetApiCompatTaskVersion>
86+
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.25077.2</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25058.4</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25058.4</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25058.4</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25058.4</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25058.4</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25058.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25058.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25058.4</MicrosoftDotNetRemoteExecutorVersion>
102-
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25058.4</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25058.4</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25079.2</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25079.2</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25079.2</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25079.2</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25079.2</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25079.2</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25079.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25079.2</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25079.2</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25079.2</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25079.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25079.2</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25079.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25079.2</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25079.2</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25079.2</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->
107107
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
108108
<!-- Installer dependencies -->
109-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-alpha.1.25057.24</MicrosoftNETCoreAppRuntimewinx64Version>
109+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-alpha.1.25068.1</MicrosoftNETCoreAppRuntimewinx64Version>
110110
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
111111
<!-- ILAsm dependencies -->
112-
<MicrosoftNETCoreILAsmVersion>10.0.0-alpha.1.25057.24</MicrosoftNETCoreILAsmVersion>
112+
<MicrosoftNETCoreILAsmVersion>10.0.0-alpha.1.25068.1</MicrosoftNETCoreILAsmVersion>
113113
<!-- Libraries dependencies -->
114114
<MicrosoftBclAsyncInterfacesVersion>6.0.0</MicrosoftBclAsyncInterfacesVersion>
115115
<MicrosoftBclHashCodeVersion>6.0.0</MicrosoftBclHashCodeVersion>
@@ -123,46 +123,46 @@
123123
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
124124
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
125125
<SystemNumericsVectorsVersion>4.6.0</SystemNumericsVectorsVersion>
126-
<SystemReflectionMetadataVersion>10.0.0-alpha.1.25057.24</SystemReflectionMetadataVersion>
127-
<SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.25057.24</SystemReflectionMetadataLoadContextVersion>
126+
<SystemReflectionMetadataVersion>10.0.0-alpha.1.25068.1</SystemReflectionMetadataVersion>
127+
<SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.25068.1</SystemReflectionMetadataLoadContextVersion>
128128
<SystemSecurityAccessControlVersion>6.0.0</SystemSecurityAccessControlVersion>
129129
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
130130
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
131131
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
132132
<SystemSecurityPermissionsVersion>7.0.0</SystemSecurityPermissionsVersion>
133-
<SystemTextJsonVersion>10.0.0-alpha.1.25057.24</SystemTextJsonVersion>
133+
<SystemTextJsonVersion>10.0.0-alpha.1.25068.1</SystemTextJsonVersion>
134134
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
135135
<SystemThreadingAccessControlVersion>7.0.0</SystemThreadingAccessControlVersion>
136136
<SystemThreadingTasksExtensionsVersion>4.6.0</SystemThreadingTasksExtensionsVersion>
137137
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
138-
<runtimenativeSystemIOPortsVersion>10.0.0-alpha.1.25057.24</runtimenativeSystemIOPortsVersion>
138+
<runtimenativeSystemIOPortsVersion>10.0.0-alpha.1.25068.1</runtimenativeSystemIOPortsVersion>
139139
<!-- Keep toolset versions in sync with dotnet/msbuild and dotnet/sdk -->
140140
<SystemCollectionsImmutableToolsetVersion>8.0.0</SystemCollectionsImmutableToolsetVersion>
141141
<SystemTextJsonToolsetVersion>8.0.4</SystemTextJsonToolsetVersion>
142142
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
143143
<SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
144144
<!-- Runtime-Assets dependencies -->
145-
<SystemRuntimeNumericsTestDataVersion>10.0.0-beta.25060.2</SystemRuntimeNumericsTestDataVersion>
146-
<SystemComponentModelTypeConverterTestDataVersion>10.0.0-beta.25060.2</SystemComponentModelTypeConverterTestDataVersion>
147-
<SystemDataCommonTestDataVersion>10.0.0-beta.25060.2</SystemDataCommonTestDataVersion>
148-
<SystemDrawingCommonTestDataVersion>10.0.0-beta.25060.2</SystemDrawingCommonTestDataVersion>
149-
<SystemFormatsTarTestDataVersion>10.0.0-beta.25060.2</SystemFormatsTarTestDataVersion>
150-
<SystemIOCompressionTestDataVersion>10.0.0-beta.25060.2</SystemIOCompressionTestDataVersion>
151-
<SystemIOPackagingTestDataVersion>10.0.0-beta.25060.2</SystemIOPackagingTestDataVersion>
152-
<SystemNetTestDataVersion>10.0.0-beta.25060.2</SystemNetTestDataVersion>
153-
<SystemPrivateRuntimeUnicodeDataVersion>10.0.0-beta.25060.2</SystemPrivateRuntimeUnicodeDataVersion>
154-
<SystemRuntimeTimeZoneDataVersion>10.0.0-beta.25060.2</SystemRuntimeTimeZoneDataVersion>
155-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>10.0.0-beta.25060.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
156-
<SystemTextRegularExpressionsTestDataVersion>10.0.0-beta.25060.2</SystemTextRegularExpressionsTestDataVersion>
157-
<SystemWindowsExtensionsTestDataVersion>10.0.0-beta.25060.2</SystemWindowsExtensionsTestDataVersion>
158-
<MicrosoftDotNetCilStripSourcesVersion>10.0.0-beta.25060.2</MicrosoftDotNetCilStripSourcesVersion>
159-
<MicrosoftNETHostModelTestDataVersion>10.0.0-beta.25060.2</MicrosoftNETHostModelTestDataVersion>
145+
<SystemRuntimeNumericsTestDataVersion>10.0.0-beta.25070.2</SystemRuntimeNumericsTestDataVersion>
146+
<SystemComponentModelTypeConverterTestDataVersion>10.0.0-beta.25070.2</SystemComponentModelTypeConverterTestDataVersion>
147+
<SystemDataCommonTestDataVersion>10.0.0-beta.25070.2</SystemDataCommonTestDataVersion>
148+
<SystemDrawingCommonTestDataVersion>10.0.0-beta.25070.2</SystemDrawingCommonTestDataVersion>
149+
<SystemFormatsTarTestDataVersion>10.0.0-beta.25070.2</SystemFormatsTarTestDataVersion>
150+
<SystemIOCompressionTestDataVersion>10.0.0-beta.25070.2</SystemIOCompressionTestDataVersion>
151+
<SystemIOPackagingTestDataVersion>10.0.0-beta.25070.2</SystemIOPackagingTestDataVersion>
152+
<SystemNetTestDataVersion>10.0.0-beta.25070.2</SystemNetTestDataVersion>
153+
<SystemPrivateRuntimeUnicodeDataVersion>10.0.0-beta.25070.2</SystemPrivateRuntimeUnicodeDataVersion>
154+
<SystemRuntimeTimeZoneDataVersion>10.0.0-beta.25070.2</SystemRuntimeTimeZoneDataVersion>
155+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>10.0.0-beta.25070.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
156+
<SystemTextRegularExpressionsTestDataVersion>10.0.0-beta.25070.2</SystemTextRegularExpressionsTestDataVersion>
157+
<SystemWindowsExtensionsTestDataVersion>10.0.0-beta.25070.2</SystemWindowsExtensionsTestDataVersion>
158+
<MicrosoftDotNetCilStripSourcesVersion>10.0.0-beta.25070.2</MicrosoftDotNetCilStripSourcesVersion>
159+
<MicrosoftNETHostModelTestDataVersion>10.0.0-beta.25070.2</MicrosoftNETHostModelTestDataVersion>
160160
<!-- xharness dependencies -->
161161
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>10.0.0-prerelease.24610.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
162162
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>10.0.0-prerelease.24610.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
163163
<MicrosoftDotNetXHarnessCLIVersion>10.0.0-prerelease.24610.1</MicrosoftDotNetXHarnessCLIVersion>
164164
<!-- hotreload-utils dependencies -->
165-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>10.0.0-alpha.0.24627.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
165+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>10.0.0-alpha.0.25070.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
166166
<!-- dotnet-optimization dependencies -->
167167
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.25067.2</optimizationwindows_ntx64MIBCRuntimeVersion>
168168
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.25067.2</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -219,9 +219,9 @@
219219
<!-- Docs -->
220220
<MicrosoftPrivateIntellisenseVersion>9.0.0-preview-20241010.1</MicrosoftPrivateIntellisenseVersion>
221221
<!-- Mono Cecil -->
222-
<MicrosoftDotNetCecilVersion>0.11.5-alpha.24627.1</MicrosoftDotNetCecilVersion>
222+
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25069.2</MicrosoftDotNetCecilVersion>
223223
<!-- ICU -->
224-
<MicrosoftNETCoreRuntimeICUTransportVersion>10.0.0-alpha.1.24627.1</MicrosoftNETCoreRuntimeICUTransportVersion>
224+
<MicrosoftNETCoreRuntimeICUTransportVersion>10.0.0-preview.2.25074.1</MicrosoftNETCoreRuntimeICUTransportVersion>
225225
<!-- MsQuic -->
226226
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.3</MicrosoftNativeQuicMsQuicSchannelVersion>
227227
<SystemNetMsQuicTransportVersion>9.0.0-alpha.1.24167.3</SystemNetMsQuicTransportVersion>

‎eng/common/internal/Tools.csproj

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,6 @@
1515
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
1616
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
1717
</ItemGroup>
18-
<PropertyGroup>
19-
<RestoreSources></RestoreSources>
20-
<RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'">
21-
https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
22-
</RestoreSources>
23-
<RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
24-
$(RestoreSources);
25-
https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json;
26-
</RestoreSources>
27-
</PropertyGroup>
2818

2919
<!-- Repository extensibility point -->
3020
<Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />

‎eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
4343

4444
# Enable repos to use a particular version of the on-line dotnet-install scripts.
45-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
45+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
4646
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
4747

4848
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
262262
if (!(Test-Path $installScript)) {
263263
Create-Directory $dotnetRoot
264264
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
265-
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
265+
$uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1"
266266

267267
Retry({
268268
Write-Host "GET $uri"

‎eng/common/tools.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
5454
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
5555

5656
# Enable repos to use a particular version of the on-line dotnet-install scripts.
57-
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
57+
# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
5858
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
5959

6060
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -295,7 +295,7 @@ function with_retries {
295295
function GetDotNetInstallScript {
296296
local root=$1
297297
local install_script="$root/dotnet-install.sh"
298-
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
298+
local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh"
299299

300300
if [[ ! -a "$install_script" ]]; then
301301
mkdir -p "$root"

‎eng/pipelines/common/xplat-setup.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ jobs:
7171
value: zip
7272
- name: tarCompression
7373
value: ''
74+
- name: exeExt
75+
value: '.exe'
7476
- name: scriptExt
7577
value: '.cmd'
7678
- name: dir
@@ -91,6 +93,8 @@ jobs:
9193
value: tar
9294
- name: tarCompression
9395
value: gz
96+
- name: exeExt
97+
value: ''
9498
- name: scriptExt
9599
value: '.sh'
96100
- name: dir

‎eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ jobs:
6969
- name: target_crossgen2_os
7070
value: osx
7171
- name: crossgen2location
72-
value: $(productDirectory)$(dir)$(targetFlavor)$(dir)crossgen2$(dir)crossgen2.dll
73-
- ${{ if ne(parameters.archType, 'x64') }}:
74-
- name: crossgen2location
75-
value: $(productDirectory)$(dir)$(targetFlavor)$(dir)x64$(dir)crossgen2$(dir)crossgen2.dll
72+
value: $(binDirectory)$(dir)crossgen2_inbuild$(dir)$(archType)$(dir)$(buildConfigUpper)$(dir)crossgen2.dll
7673
- name: librariesProductDllDir
7774
value: $(Build.SourcesDirectory)$(dir)artifacts$(dir)bin$(dir)runtime$(dir)net10.0-$(osGroup)$(osSubgroup)-$(buildConfig)-$(archType)
7875

0 commit comments

Comments
 (0)