Skip to content

Commit 99ba036

Browse files
author
Mirroring
committed
Merge commit 'e7ed8bb3bca4cfee45fc8ead29d1f04da8d8d7eb'
2 parents d4015d6 + e7ed8bb commit 99ba036

File tree

80 files changed

+2955
-1745
lines changed

Some content is hidden

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

80 files changed

+2955
-1745
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "9.0.0-prerelease.25103.3",
18+
"version": "9.0.0-prerelease.25113.3",
1919
"commands": [
2020
"xharness"
2121
]

‎NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
1212
<add key="darc-pub-dotnet-emsdk-78be8cd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-78be8cdf/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-dad5528" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dad5528e/nuget/v3/index.json" />
1314
<!-- End: Package sources from dotnet-emsdk -->
1415
<!-- Begin: Package sources from dotnet-sdk -->
16+
<add key="darc-pub-dotnet-sdk-346d06b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-sdk-346d06ba/nuget/v3/index.json" />
1517
<!-- End: Package sources from dotnet-sdk -->
1618
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1719
<!--

‎eng/Version.Details.xml

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

‎eng/Versions.props

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@
3636
</ItemGroup>
3737
<PropertyGroup>
3838
<!-- dotnet/roslyn-analyzers dependencies -->
39-
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.25076.3</MicrosoftCodeAnalysisAnalyzersVersion>
40-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25076.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
39+
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.25123.3</MicrosoftCodeAnalysisAnalyzersVersion>
40+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25123.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
4141
<!-- dotnet/roslyn dependencies -->
4242
<!--
4343
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.
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.12.0-3.25105.5</MicrosoftCodeAnalysisCSharpVersion>
48-
<MicrosoftCodeAnalysisVersion>4.12.0-3.25105.5</MicrosoftCodeAnalysisVersion>
49-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25105.5</MicrosoftNetCompilersToolsetVersion>
47+
<MicrosoftCodeAnalysisCSharpVersion>4.12.0-3.25124.2</MicrosoftCodeAnalysisCSharpVersion>
48+
<MicrosoftCodeAnalysisVersion>4.12.0-3.25124.2</MicrosoftCodeAnalysisVersion>
49+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.25124.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,24 +83,24 @@
8383
<PropertyGroup>
8484
<StaticCsVersion>0.2.0</StaticCsVersion>
8585
<!-- SDK dependencies (also used in wasm build tests -->
86-
<MicrosoftDotNetApiCompatTaskVersion>9.0.103</MicrosoftDotNetApiCompatTaskVersion>
86+
<MicrosoftDotNetApiCompatTaskVersion>9.0.104</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25077.4</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25077.4</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25077.4</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25077.4</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25077.4</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25077.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25077.4</MicrosoftDotNetRemoteExecutorVersion>
102-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25077.4</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25077.4</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.25111.5</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.25111.5</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.25111.5</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.25111.5</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25111.5</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.25111.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25111.5</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.25111.5</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.25111.5</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->
@@ -141,20 +141,20 @@
141141
<SystemReflectionMetadataToolsetVersion>8.0.0</SystemReflectionMetadataToolsetVersion>
142142
<SystemReflectionMetadataLoadContextToolsetVersion>8.0.0</SystemReflectionMetadataLoadContextToolsetVersion>
143143
<!-- Runtime-Assets dependencies -->
144-
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25071.2</SystemRuntimeNumericsTestDataVersion>
145-
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25071.2</SystemComponentModelTypeConverterTestDataVersion>
146-
<SystemDataCommonTestDataVersion>9.0.0-beta.25071.2</SystemDataCommonTestDataVersion>
147-
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25071.2</SystemDrawingCommonTestDataVersion>
148-
<SystemFormatsTarTestDataVersion>9.0.0-beta.25071.2</SystemFormatsTarTestDataVersion>
149-
<SystemIOCompressionTestDataVersion>9.0.0-beta.25071.2</SystemIOCompressionTestDataVersion>
150-
<SystemIOPackagingTestDataVersion>9.0.0-beta.25071.2</SystemIOPackagingTestDataVersion>
151-
<SystemNetTestDataVersion>9.0.0-beta.25071.2</SystemNetTestDataVersion>
152-
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25071.2</SystemPrivateRuntimeUnicodeDataVersion>
153-
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25071.2</SystemRuntimeTimeZoneDataVersion>
154-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25071.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
155-
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25071.2</SystemTextRegularExpressionsTestDataVersion>
156-
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25071.2</SystemWindowsExtensionsTestDataVersion>
157-
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25071.2</MicrosoftDotNetCilStripSourcesVersion>
144+
<SystemRuntimeNumericsTestDataVersion>9.0.0-beta.25113.2</SystemRuntimeNumericsTestDataVersion>
145+
<SystemComponentModelTypeConverterTestDataVersion>9.0.0-beta.25113.2</SystemComponentModelTypeConverterTestDataVersion>
146+
<SystemDataCommonTestDataVersion>9.0.0-beta.25113.2</SystemDataCommonTestDataVersion>
147+
<SystemDrawingCommonTestDataVersion>9.0.0-beta.25113.2</SystemDrawingCommonTestDataVersion>
148+
<SystemFormatsTarTestDataVersion>9.0.0-beta.25113.2</SystemFormatsTarTestDataVersion>
149+
<SystemIOCompressionTestDataVersion>9.0.0-beta.25113.2</SystemIOCompressionTestDataVersion>
150+
<SystemIOPackagingTestDataVersion>9.0.0-beta.25113.2</SystemIOPackagingTestDataVersion>
151+
<SystemNetTestDataVersion>9.0.0-beta.25113.2</SystemNetTestDataVersion>
152+
<SystemPrivateRuntimeUnicodeDataVersion>9.0.0-beta.25113.2</SystemPrivateRuntimeUnicodeDataVersion>
153+
<SystemRuntimeTimeZoneDataVersion>9.0.0-beta.25113.2</SystemRuntimeTimeZoneDataVersion>
154+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>9.0.0-beta.25113.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
155+
<SystemTextRegularExpressionsTestDataVersion>9.0.0-beta.25113.2</SystemTextRegularExpressionsTestDataVersion>
156+
<SystemWindowsExtensionsTestDataVersion>9.0.0-beta.25113.2</SystemWindowsExtensionsTestDataVersion>
157+
<MicrosoftDotNetCilStripSourcesVersion>9.0.0-beta.25113.2</MicrosoftDotNetCilStripSourcesVersion>
158158
<!-- dotnet-optimization dependencies -->
159159
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx64MIBCRuntimeVersion>
160160
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.24462.2</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -184,10 +184,10 @@
184184
<!-- Testing -->
185185
<MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
186186
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
187-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25103.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
188-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25103.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
189-
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25103.3</MicrosoftDotNetXHarnessCLIVersion>
190-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25077.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
187+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25113.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
188+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25113.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
189+
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25113.3</MicrosoftDotNetXHarnessCLIVersion>
190+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.25153.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
191191
<NUnitVersion>3.12.0</NUnitVersion>
192192
<NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>
193193
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
@@ -215,14 +215,14 @@
215215
<!-- Docs -->
216216
<MicrosoftPrivateIntellisenseVersion>9.0.0-preview-20241010.1</MicrosoftPrivateIntellisenseVersion>
217217
<!-- Mono Cecil -->
218-
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25102.5</MicrosoftDotNetCecilVersion>
218+
<MicrosoftDotNetCecilVersion>0.11.5-alpha.25112.2</MicrosoftDotNetCecilVersion>
219219
<!-- ILCompiler -->
220220
<MicrosoftDotNetILCompilerVersion>9.0.0-rtm.24511.16</MicrosoftDotNetILCompilerVersion>
221221
<!-- ICU -->
222-
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25105.1</MicrosoftNETCoreRuntimeICUTransportVersion>
222+
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.25157.1</MicrosoftNETCoreRuntimeICUTransportVersion>
223223
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-rtm.24466.4</MicrosoftNETCoreRuntimeICUTransportVersion>
224224
<!-- MsQuic -->
225-
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.3</MicrosoftNativeQuicMsQuicSchannelVersion>
225+
<MicrosoftNativeQuicMsQuicSchannelVersion>2.4.8</MicrosoftNativeQuicMsQuicSchannelVersion>
226226
<SystemNetMsQuicTransportVersion>9.0.0-alpha.1.24167.3</SystemNetMsQuicTransportVersion>
227227
<!-- Mono LLVM -->
228228
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>19.1.0-alpha.1.25113.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
@@ -262,8 +262,8 @@
262262
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
263263
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
264264
<!-- sdk version, for testing workloads -->
265-
<!--<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>-->
266-
<SdkVersionForWorkloadTesting>9.0.102</SdkVersionForWorkloadTesting>
265+
<SdkVersionForWorkloadTesting>$(MicrosoftDotNetApiCompatTaskVersion)</SdkVersionForWorkloadTesting>
266+
<!--<SdkVersionForWorkloadTesting>9.0.102</SdkVersionForWorkloadTesting>-->
267267
<runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>9.0.0-alpha.1.24175.1</runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion>
268268
<EmsdkPackageVersion>$(MicrosoftNETRuntimeEmscriptenVersion)</EmsdkPackageVersion>
269269
<NodePackageVersion>$(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion)</NodePackageVersion>

‎eng/install-native-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ case "$os" in
4444
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
4545
# Skip brew update for now, see https://github.com/actions/setup-python/issues/577
4646
# brew update --preinstall
47-
brew bundle --no-upgrade --no-lock --file "$(dirname "$0")/Brewfile"
47+
brew bundle --no-upgrade --file "$(dirname "$0")/Brewfile"
4848
;;
4949

5050
*)

‎eng/packaging.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<TfmSpecificPackageFile Include="@(TfmRuntimeSpecificPackageFile)"
134134
PackagePath="runtimes\$(_packageTargetRuntime)\$(BuildOutputTargetFolder)\$(_targetFrameworkWithoutSuffix)\" />
135135
<!-- Create the item and use its metadata separately to avoid MSB4120. See https://aka.ms/msbuild/metadata-self-ref for more info. -->
136-
<_RuntimeSymbolPath Include="$(RuntimeSymbolPath)" />
136+
<_RuntimeSymbolPath Include="@(TfmRuntimeSpecificPackageFile->'%(RootDir)%(Directory)%(FileName).pdb')" Condition="'%(TfmRuntimeSpecificPackageFile.Extension)' == '.dll'" KeepMetadata="None" />
137137
<TfmSpecificDebugSymbolsFile Include="@(_RuntimeSymbolPath)"
138138
TargetPath="/runtimes/$(_packageTargetRuntime)/$(BuildOutputTargetFolder)/$(_targetFrameworkWithoutSuffix)/%(_RuntimeSymbolPath.Filename)%(_RuntimeSymbolPath.Extension)"
139139
TargetFramework="$(_targetFrameworkWithoutSuffix)"

‎global.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "9.0.102",
3+
"version": "9.0.103",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "9.0.102"
8+
"dotnet": "9.0.103"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4",
12-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25077.4",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25077.4",
11+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5",
12+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25111.5",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25111.5",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"

‎src/coreclr/.nuget/Directory.Build.props

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
<SkipIndexCheck>true</SkipIndexCheck>
2020
</PropertyGroup>
2121

22-
<!-- CoreCLR nuget packages shouldn't be published during servicing. -->
23-
<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
24-
<IsShipping>false</IsShipping>
25-
</PropertyGroup>
26-
2722
<ItemGroup>
2823
<PackageIndex Condition="'$(MSBuildProjectExtension)' == '.pkgproj'" Include="$(PackageIndexFile)" />
2924
</ItemGroup>

‎src/coreclr/.nuget/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<!-- Central place to set the versions of all nuget packages produced in the repo -->
66
<PackageVersion Condition="'$(PackageVersion)' == ''">$(ProductVersion)</PackageVersion>
7-
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == '' and '$(PreReleaseVersionLabel)' != 'servicing'">$(PackageVersion)</StableVersion>
7+
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
88
<StableVersion Condition="'$(IsShippingPackage)' != 'true' and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>
99
</PropertyGroup>
1010

‎src/coreclr/jit/assertionprop.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2211,6 +2211,22 @@ AssertionInfo Compiler::optAssertionGenJtrue(GenTree* tree)
22112211
// If op1 is lcl and op2 is const or lcl, create assertion.
22122212
if ((op1->gtOper == GT_LCL_VAR) && (op2->OperIsConst() || (op2->gtOper == GT_LCL_VAR))) // Fix for Dev10 851483
22132213
{
2214+
// Watch out for cases where long local(s) are implicitly truncated.
2215+
//
2216+
LclVarDsc* const lcl1Dsc = lvaGetDesc(op1->AsLclVarCommon());
2217+
if ((lcl1Dsc->TypeGet() == TYP_LONG) && (op1->TypeGet() != TYP_LONG))
2218+
{
2219+
return NO_ASSERTION_INDEX;
2220+
}
2221+
if (op2->OperIs(GT_LCL_VAR))
2222+
{
2223+
LclVarDsc* const lcl2Dsc = lvaGetDesc(op2->AsLclVarCommon());
2224+
if ((lcl2Dsc->TypeGet() == TYP_LONG) && (op2->TypeGet() != TYP_LONG))
2225+
{
2226+
return NO_ASSERTION_INDEX;
2227+
}
2228+
}
2229+
22142230
return optCreateJtrueAssertions(op1, op2, assertionKind);
22152231
}
22162232
else if (!optLocalAssertionProp)

0 commit comments

Comments
 (0)