Skip to content

Commit 208b64e

Browse files
carlossanlopcarlossanlop
authored
Merge pull request #99579 from carlossanlop/release/8.0-staging
[manual] Merge release/8.0-staging into release/8.0
2 parents 13d578b + 0ba49c9 commit 208b64e

File tree

30 files changed

+601
-142
lines changed

30 files changed

+601
-142
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": "8.0.0-prerelease.24060.1",
18+
"version": "8.0.0-prerelease.24112.2",
1919
"commands": [
2020
"xharness"
2121
]

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<add key="darc-pub-dotnet-emsdk-9a29abd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9a29abdd/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-1639670" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-1639670c/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!-- Begin: Package sources from dotnet-sdk -->
1515
<!-- End: Package sources from dotnet-sdk -->

‎eng/Publishing.props‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project>
2-
<!-- TODO: Consolidate the Publishing.props files into here. -->
2+
33
<PropertyGroup>
4-
<PublishingVersion>3</PublishingVersion>
4+
<ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
55
</PropertyGroup>
6-
</Project>
6+
7+
</Project>

‎eng/Version.Details.xml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,23 @@
9090
<Sha>45dd3a73dd5b64b010c4251303b3664bb30df029</Sha>
9191
<SourceBuild RepoName="cecil" ManagedOnly="true" />
9292
</Dependency>
93-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.3">
93+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.4">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>9a29abdd764a4de0f253ed368871877a47725247</Sha>
95+
<Sha>1639670c6547454278f51afc5c74e20f8acc7abd</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.3-servicing.24108.3">
97+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.4-servicing.24156.2">
9898
<Uri>https://github.com/dotnet/emsdk</Uri>
99-
<Sha>9a29abdd764a4de0f253ed368871877a47725247</Sha>
99+
<Sha>1639670c6547454278f51afc5c74e20f8acc7abd</Sha>
100100
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
101101
</Dependency>
102102
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24061.1">
103103
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
104104
<Sha>453a37ef7ae6c335cd49b3b9ab7713c87faeb265</Sha>
105105
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
106106
</Dependency>
107-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24065.1">
107+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24158.3">
108108
<Uri>https://github.com/dotnet/source-build-externals</Uri>
109-
<Sha>83274d94c7e2ff21081b0d75ecbec2da2241f831</Sha>
109+
<Sha>7a9b99e457a2b9792a3c17ccaf95d80038725108</Sha>
110110
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
111111
</Dependency>
112112
</ProductDependencies>
@@ -185,57 +185,57 @@
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186186
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
187187
</Dependency>
188-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24108.4">
188+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24115.2">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
190-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
190+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
191191
</Dependency>
192-
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24108.4">
192+
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24115.2">
193193
<Uri>https://github.com/dotnet/runtime-assets</Uri>
194-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
194+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
195195
</Dependency>
196-
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24108.4">
196+
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24115.2">
197197
<Uri>https://github.com/dotnet/runtime-assets</Uri>
198-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
198+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
199199
</Dependency>
200-
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24108.4">
200+
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24115.2">
201201
<Uri>https://github.com/dotnet/runtime-assets</Uri>
202-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
202+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
203203
</Dependency>
204-
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24108.4">
204+
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24115.2">
205205
<Uri>https://github.com/dotnet/runtime-assets</Uri>
206-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
206+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
207207
</Dependency>
208-
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24108.4">
208+
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24115.2">
209209
<Uri>https://github.com/dotnet/runtime-assets</Uri>
210-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
210+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
211211
</Dependency>
212-
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24108.4">
212+
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24115.2">
213213
<Uri>https://github.com/dotnet/runtime-assets</Uri>
214-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
214+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
215215
</Dependency>
216-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24108.4">
216+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24115.2">
217217
<Uri>https://github.com/dotnet/runtime-assets</Uri>
218-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
218+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
219219
</Dependency>
220-
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24108.4">
220+
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24115.2">
221221
<Uri>https://github.com/dotnet/runtime-assets</Uri>
222-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
222+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
223223
</Dependency>
224-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24108.4">
224+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24115.2">
225225
<Uri>https://github.com/dotnet/runtime-assets</Uri>
226-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
226+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
227227
</Dependency>
228-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24108.4">
228+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24115.2">
229229
<Uri>https://github.com/dotnet/runtime-assets</Uri>
230-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
230+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
231231
</Dependency>
232-
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24108.4">
232+
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24115.2">
233233
<Uri>https://github.com/dotnet/runtime-assets</Uri>
234-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
234+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
235235
</Dependency>
236-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24108.4">
236+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24115.2">
237237
<Uri>https://github.com/dotnet/runtime-assets</Uri>
238-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
238+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
239239
</Dependency>
240240
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23566.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100">
241241
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -322,17 +322,17 @@
322322
<Uri>https://github.com/dotnet/runtime</Uri>
323323
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
324324
</Dependency>
325-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24060.1">
325+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24112.2">
326326
<Uri>https://github.com/dotnet/xharness</Uri>
327-
<Sha>a417169d3ba558fd6daa522f04e686574bbce520</Sha>
327+
<Sha>c055cc57f21796e79ace4bca2b070a8777f2446a</Sha>
328328
</Dependency>
329-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24060.1">
329+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24112.2">
330330
<Uri>https://github.com/dotnet/xharness</Uri>
331-
<Sha>a417169d3ba558fd6daa522f04e686574bbce520</Sha>
331+
<Sha>c055cc57f21796e79ace4bca2b070a8777f2446a</Sha>
332332
</Dependency>
333-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24060.1">
333+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24112.2">
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335-
<Sha>a417169d3ba558fd6daa522f04e686574bbce520</Sha>
335+
<Sha>c055cc57f21796e79ace4bca2b070a8777f2446a</Sha>
336336
</Dependency>
337337
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24113.2">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -358,9 +358,9 @@
358358
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
359359
<Sha>bc857c64c5c5f1fc73048261e8f471c3310224d2</Sha>
360360
</Dependency>
361-
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24108.4">
361+
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24115.2">
362362
<Uri>https://github.com/dotnet/runtime-assets</Uri>
363-
<Sha>ca6c46012f68934198ce0d303196c3ae179230f5</Sha>
363+
<Sha>0827f89642a6443c96a87990e3b910f6aa4cc4ed</Sha>
364364
</Dependency>
365365
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.23566.2">
366366
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/Versions.props‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -143,20 +143,20 @@
143143
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
144144
<runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
145145
<!-- Runtime-Assets dependencies -->
146-
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24108.4</SystemRuntimeNumericsTestDataVersion>
147-
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24108.4</SystemComponentModelTypeConverterTestDataVersion>
148-
<SystemDataCommonTestDataVersion>8.0.0-beta.24108.4</SystemDataCommonTestDataVersion>
149-
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24108.4</SystemDrawingCommonTestDataVersion>
150-
<SystemFormatsTarTestDataVersion>8.0.0-beta.24108.4</SystemFormatsTarTestDataVersion>
151-
<SystemIOCompressionTestDataVersion>8.0.0-beta.24108.4</SystemIOCompressionTestDataVersion>
152-
<SystemIOPackagingTestDataVersion>8.0.0-beta.24108.4</SystemIOPackagingTestDataVersion>
153-
<SystemNetTestDataVersion>8.0.0-beta.24108.4</SystemNetTestDataVersion>
154-
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24108.4</SystemPrivateRuntimeUnicodeDataVersion>
155-
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24108.4</SystemRuntimeTimeZoneDataVersion>
156-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24108.4</SystemSecurityCryptographyX509CertificatesTestDataVersion>
157-
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24108.4</SystemTextRegularExpressionsTestDataVersion>
158-
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24108.4</SystemWindowsExtensionsTestDataVersion>
159-
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24108.4</MicrosoftDotNetCilStripSourcesVersion>
146+
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24115.2</SystemRuntimeNumericsTestDataVersion>
147+
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24115.2</SystemComponentModelTypeConverterTestDataVersion>
148+
<SystemDataCommonTestDataVersion>8.0.0-beta.24115.2</SystemDataCommonTestDataVersion>
149+
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24115.2</SystemDrawingCommonTestDataVersion>
150+
<SystemFormatsTarTestDataVersion>8.0.0-beta.24115.2</SystemFormatsTarTestDataVersion>
151+
<SystemIOCompressionTestDataVersion>8.0.0-beta.24115.2</SystemIOCompressionTestDataVersion>
152+
<SystemIOPackagingTestDataVersion>8.0.0-beta.24115.2</SystemIOPackagingTestDataVersion>
153+
<SystemNetTestDataVersion>8.0.0-beta.24115.2</SystemNetTestDataVersion>
154+
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24115.2</SystemPrivateRuntimeUnicodeDataVersion>
155+
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24115.2</SystemRuntimeTimeZoneDataVersion>
156+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24115.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
157+
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24115.2</SystemTextRegularExpressionsTestDataVersion>
158+
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24115.2</SystemWindowsExtensionsTestDataVersion>
159+
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24115.2</MicrosoftDotNetCilStripSourcesVersion>
160160
<!-- dotnet-optimization dependencies -->
161161
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
162162
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -165,7 +165,7 @@
165165
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationlinuxarm64MIBCRuntimeVersion>
166166
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23566.3</optimizationPGOCoreCLRVersion>
167167
<!-- Not auto-updated. -->
168-
<MicrosoftDiaSymReaderNativeVersion>16.11.29-beta1.23404.4</MicrosoftDiaSymReaderNativeVersion>
168+
<MicrosoftDiaSymReaderNativeVersion>17.8.7-beta1.24113.1</MicrosoftDiaSymReaderNativeVersion>
169169
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
170170
<TraceEventVersion>3.0.3</TraceEventVersion>
171171
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
@@ -183,9 +183,9 @@
183183
<!-- Testing -->
184184
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
185185
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
186-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24060.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
187-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24060.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
188-
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24060.1</MicrosoftDotNetXHarnessCLIVersion>
186+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24112.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
187+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24112.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
188+
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24112.2</MicrosoftDotNetXHarnessCLIVersion>
189189
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24072.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
190190
<XUnitVersion>2.4.2</XUnitVersion>
191191
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
@@ -240,7 +240,7 @@
240240
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
241241
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
242242
-->
243-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
243+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.4</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
244244
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</MicrosoftNETRuntimeEmscriptenVersion>
245245
<!-- workloads -->
246246
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

‎src/coreclr/jit/codegencommon.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6154,8 +6154,14 @@ void CodeGen::genFnProlog()
61546154
};
61556155

61566156
#if defined(TARGET_AMD64) || defined(TARGET_ARM64) || defined(TARGET_ARM)
6157-
assignIncomingRegisterArgs(&intRegState);
6157+
// Handle float parameters first; in the presence of struct promotion
6158+
// we can have parameters that are homed into float registers but
6159+
// passed in integer registers. So make sure we get those out of the
6160+
// integer registers before we potentially override those as part of
6161+
// handling integer parameters.
6162+
61586163
assignIncomingRegisterArgs(&floatRegState);
6164+
assignIncomingRegisterArgs(&intRegState);
61596165
#else
61606166
assignIncomingRegisterArgs(&intRegState);
61616167
#endif

‎src/coreclr/jit/lsra.cpp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,6 +1663,21 @@ bool LinearScan::isRegCandidate(LclVarDsc* varDsc)
16631663
return false;
16641664
}
16651665

1666+
// Avoid allocating parameters that are passed in float regs into integer
1667+
// registers. We currently home float registers before integer registers,
1668+
// so that kind of enregistration can trash integer registers containing
1669+
// other parameters.
1670+
// We assume that these cases will be homed to float registers if they are
1671+
// promoted.
1672+
// TODO-CQ: Combine integer and float register homing to handle these kinds
1673+
// of conflicts.
1674+
if ((varDsc->TypeGet() == TYP_STRUCT) && varDsc->lvIsRegArg && !varDsc->lvPromoted &&
1675+
varTypeUsesIntReg(varDsc->GetRegisterType()) && genIsValidFloatReg(varDsc->GetArgReg()))
1676+
{
1677+
compiler->lvaSetVarDoNotEnregister(lclNum DEBUGARG(DoNotEnregisterReason::IsStructArg));
1678+
return false;
1679+
}
1680+
16661681
// Are we not optimizing and we have exception handlers?
16671682
// if so mark all args and locals as volatile, so that they
16681683
// won't ever get enregistered.

‎src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
<_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))))</_hostOS>
66

77
<_targetOS>$(RuntimeIdentifier.SubString(0, $(RuntimeIdentifier.LastIndexOf('-'))))</_targetOS>
8-
<_indexOfPeriod>$(_targetOS.IndexOf('.'))</_indexOfPeriod>
9-
<_targetOS Condition="'$(_indexOfPeriod)' &gt; -1">$(_targetOS.SubString(0, $(_indexOfPeriod)))</_targetOS>
8+
<_targetOS Condition="$(_targetOS.Contains('.'))">$(_targetOS.SubString(0, $(_targetOS.IndexOf('.'))))</_targetOS>
109
<_targetOS Condition="$(_targetOS.StartsWith('win'))">win</_targetOS>
1110

1211
<!-- On non-Windows, determine _hostArchitecture from NETCoreSdkPortableRuntimeIdentifier -->

‎src/coreclr/vm/zapsig.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,6 +1350,9 @@ BOOL ZapSig::EncodeMethod(
13501350
else
13511351
{
13521352
Instantiation inst = pMethod->GetMethodInstantiation();
1353+
1354+
pSigBuilder->AppendData(inst.GetNumArgs());
1355+
13531356
for (DWORD i = 0; i < inst.GetNumArgs(); i++)
13541357
{
13551358
TypeHandle t = inst[i];

‎src/installer/prepare-artifacts.proj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
</PropertyGroup>
2424
<Import Project="../tools/Sign.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
2525

26+
<Import Project="$(RepositoryEngineeringDir)Publishing.props" Condition="Exists('$(RepositoryEngineeringDir)Publishing.props')" />
27+
2628
<UsingTask TaskName="GenerateChecksums" AssemblyFile="$(InstallerTasksAssemblyPath)" />
2729

2830
<PropertyGroup>
@@ -56,6 +58,16 @@
5658
<ManifestBuildData Include="AzureDevOpsBranch=$(BUILD_SOURCEBRANCH)" />
5759
</ItemGroup>
5860

61+
<!--
62+
Set metadata for assets that are not marked as NonShipping.
63+
This is used to determine if the asset should be shipped as part of .NET release.
64+
-->
65+
<ItemDefinitionGroup>
66+
<ItemsToPush>
67+
<ManifestArtifactData Condition="'$(ProducesDotNetReleaseShippingAssets)' == 'true'">DotNetReleaseShipping=true</ManifestArtifactData>
68+
</ItemsToPush>
69+
</ItemDefinitionGroup>
70+
5971
<!--
6072
Run Arcade's signing project directly. The 'eng/Signing.props' extensibility props file checks
6173
if '$(<StageName>)' == 'true' and points Arcade to the correct files.

0 commit comments

Comments
 (0)