Skip to content

Commit 7551d35

Browse files
tomeksowitomeksowi
committed
Merge branch 'main' into empty-struct-passing
2 parents d4f81be + aa0a7e9 commit 7551d35

File tree

597 files changed

+12311
-7915
lines changed

Some content is hidden

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

597 files changed

+12311
-7915
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.24311.2",
18+
"version": "9.0.0-prerelease.24312.3",
1919
"commands": [
2020
"xharness"
2121
]

‎eng/ILLink.Substitutions.Resources.template‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
<linker>
22
<!-- System.Resources.UseSystemResourceKeys removes resource strings and instead uses the resource key as the exception message -->
33
<assembly fullname="{AssemblyName}" feature="System.Resources.UseSystemResourceKeys" featurevalue="true">
4-
<!-- System.Resources.UseSystemResourceKeys removes resource strings and instead uses the resource key as the exception message -->
54
<resource name="{StringResourcesName}.resources" action="remove" />
65
<type fullname="System.SR">
76
<method signature="System.Boolean UsingResourceKeys()" body="stub" value="true" />
7+
<method signature="System.Boolean GetUsingResourceKeysSwitchValue()" body="stub" value="true" />
8+
</type>
9+
</assembly>
10+
<assembly fullname="{AssemblyName}" feature="System.Resources.UseSystemResourceKeys" featurevalue="false">
11+
<type fullname="System.SR">
12+
<method signature="System.Boolean UsingResourceKeys()" body="stub" value="false" />
13+
<method signature="System.Boolean GetUsingResourceKeysSwitchValue()" body="stub" value="false" />
814
</type>
915
</assembly>
1016
</linker>

‎eng/Subsets.props‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@
121121
<!-- CLR NativeAot only builds in a subset of the matrix -->
122122
<_NativeAotSupportedOS Condition="'$(TargetOS)' == 'windows' or '$(TargetOS)' == 'linux' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'freebsd'">true</_NativeAotSupportedOS>
123123
<_NativeAotSupportedArch Condition="'$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'arm' or ('$(TargetOS)' == 'windows' and '$(TargetArchitecture)' == 'x86')">true</_NativeAotSupportedArch>
124-
<NativeAotSupported Condition="'$(_NativeAotSupportedOS)' == 'true' and '$(_NativeAotSupportedArch)' == 'true'">true</NativeAotSupported>
125-
<UseNativeAotForComponents Condition="'$(NativeAotSupported)' == 'true' and '$(TargetOS)' == '$(HostOS)' and ('$(TargetOS)' != 'windows' or '$(TargetArchitecture)' != 'x86') and '$(TargetsLinuxBionic)' != 'true'">true</UseNativeAotForComponents>
124+
<NativeAotSupported Condition="'$(_NativeAotSupportedOS)' == 'true' and $(_NativeAotSupportedArch) == 'true'">true</NativeAotSupported>
126125

127126
<!-- If we're building clr.nativeaotlibs and not building the CLR runtime, compile libraries against NativeAOT CoreLib -->
128127
<UseNativeAotCoreLib Condition="'$(TestNativeAot)' == 'true' or ($(_subset.Contains('+clr.nativeaotlibs+')) and !$(_subset.Contains('+clr.native+')) and !$(_subset.Contains('+clr.runtime+')) and !$(_subset.Contains('+clr.corelib+')))">true</UseNativeAotCoreLib>
@@ -287,10 +286,7 @@
287286
AdditionalProperties="%(AdditionalProperties);
288287
ClrCrossComponentsSubset=true;
289288
HostArchitecture=$(BuildArchitecture);
290-
TargetArchitecture=$(TargetArchitecture);
291289
HostCrossOS=$(HostOS);
292-
HostOS=$(HostOS);
293-
TargetOS=$(TargetOS);
294290
PgoInstrument=false;
295291
NoPgoOptimize=true;
296292
CrossBuild=false;

‎eng/Version.Details.xml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="9.0.0-preview.6.24303.1">
3+
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="9.0.0-preview.6.24312.1">
44
<Uri>https://github.com/dotnet/icu</Uri>
5-
<Sha>b7fb07bc07a95b5ef13df8c2b6210649b3238ef9</Sha>
5+
<Sha>4fb2c4adac4956c542effd0b740b86297cfec759</Sha>
66
</Dependency>
77
<Dependency Name="System.Net.MsQuic.Transport" Version="9.0.0-alpha.1.24167.3">
88
<Uri>https://github.com/dotnet/msquic</Uri>
@@ -12,9 +12,9 @@
1212
<Uri>https://github.com/dotnet/wcf</Uri>
1313
<Sha>7f504aabb1988e9a093c1e74d8040bd52feb2f01</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.34.Python.win-x64" Version="9.0.0-preview.6.24305.1">
15+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.3.1.34.Python.win-x64" Version="9.0.0-preview.6.24317.1">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>f4198024fa141eb95217fa03652db48757ffc1ce</Sha>
17+
<Sha>2e1cfd604ff9f18956d998467819a88c02f7aa1e</Sha>
1818
</Dependency>
1919
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="16.0.5-alpha.1.24204.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport">
2020
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -58,24 +58,24 @@
5858
<Sha>a045dd54a4c44723c215d992288160eb1401bb7f</Sha>
5959
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24230.1">
61+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24313.1">
6262
<Uri>https://github.com/dotnet/cecil</Uri>
63-
<Sha>7a4a59f9f66baf6711a6ce2de01d3b2c62ed72d8</Sha>
63+
<Sha>d145726036eb9c09a0e3cf03c4f70effd3b31cd7</Sha>
6464
</Dependency>
6565
<!-- Intermediate is necessary for source build. -->
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.cecil" Version="0.11.4-alpha.24230.1">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.cecil" Version="0.11.4-alpha.24313.1">
6767
<Uri>https://github.com/dotnet/cecil</Uri>
68-
<Sha>7a4a59f9f66baf6711a6ce2de01d3b2c62ed72d8</Sha>
68+
<Sha>d145726036eb9c09a0e3cf03c4f70effd3b31cd7</Sha>
6969
<SourceBuild RepoName="cecil" ManagedOnly="true" />
7070
</Dependency>
71-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.6.24305.1">
71+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.6.24317.1">
7272
<Uri>https://github.com/dotnet/emsdk</Uri>
73-
<Sha>f4198024fa141eb95217fa03652db48757ffc1ce</Sha>
73+
<Sha>2e1cfd604ff9f18956d998467819a88c02f7aa1e</Sha>
7474
</Dependency>
7575
<!-- Intermediate is necessary for source build. -->
76-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.0-preview.6.24305.1">
76+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.0-preview.6.24317.1">
7777
<Uri>https://github.com/dotnet/emsdk</Uri>
78-
<Sha>f4198024fa141eb95217fa03652db48757ffc1ce</Sha>
78+
<Sha>2e1cfd604ff9f18956d998467819a88c02f7aa1e</Sha>
7979
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
8080
</Dependency>
8181
<!-- Intermediate is necessary for source build. -->
@@ -320,17 +320,17 @@
320320
<Uri>https://github.com/dotnet/runtime</Uri>
321321
<Sha>8fac5af2b11dc98fa0504f6fd06df790164ec958</Sha>
322322
</Dependency>
323-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24311.2">
323+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24312.3">
324324
<Uri>https://github.com/dotnet/xharness</Uri>
325-
<Sha>975b330d51119efc4884f7a323784662cbf74391</Sha>
325+
<Sha>6ce15319de72ab6d4c3b0f4c40f59300cffc5450</Sha>
326326
</Dependency>
327-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.24311.2">
327+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.24312.3">
328328
<Uri>https://github.com/dotnet/xharness</Uri>
329-
<Sha>975b330d51119efc4884f7a323784662cbf74391</Sha>
329+
<Sha>6ce15319de72ab6d4c3b0f4c40f59300cffc5450</Sha>
330330
</Dependency>
331-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24311.2">
331+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24312.3">
332332
<Uri>https://github.com/dotnet/xharness</Uri>
333-
<Sha>975b330d51119efc4884f7a323784662cbf74391</Sha>
333+
<Sha>6ce15319de72ab6d4c3b0f4c40f59300cffc5450</Sha>
334334
</Dependency>
335335
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24311.10">
336336
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -352,38 +352,38 @@
352352
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
353353
<Sha>c3acfd159662959ff09f3a0d7663023db48bb78a</Sha>
354354
</Dependency>
355-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="9.0.0-alpha.0.24303.1">
355+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="9.0.0-alpha.0.24312.1">
356356
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
357-
<Sha>68c6c65054f2720f503402903a82eefd5e1ccfda</Sha>
357+
<Sha>f1b0f9c44da6713b2eb02b754a8ef653ca035874</Sha>
358358
</Dependency>
359359
<Dependency Name="System.Runtime.Numerics.TestData" Version="9.0.0-beta.24312.1">
360360
<Uri>https://github.com/dotnet/runtime-assets</Uri>
361361
<Sha>40711d8fe9f9971dada6d9f8388f19978bb14223</Sha>
362362
</Dependency>
363-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-3.24311.10">
363+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-3.24313.9">
364364
<Uri>https://github.com/dotnet/roslyn</Uri>
365-
<Sha>f2705c0be613ddc70fb08e1fbef83a204ca92f7e</Sha>
365+
<Sha>0b8371953e61f6179f39f1d62ebbd6a251f335e0</Sha>
366366
</Dependency>
367-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.11.0-3.24311.10">
367+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.11.0-3.24313.9">
368368
<Uri>https://github.com/dotnet/roslyn</Uri>
369-
<Sha>f2705c0be613ddc70fb08e1fbef83a204ca92f7e</Sha>
369+
<Sha>0b8371953e61f6179f39f1d62ebbd6a251f335e0</Sha>
370370
</Dependency>
371-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.11.0-3.24311.10">
371+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.11.0-3.24313.9">
372372
<Uri>https://github.com/dotnet/roslyn</Uri>
373-
<Sha>f2705c0be613ddc70fb08e1fbef83a204ca92f7e</Sha>
373+
<Sha>0b8371953e61f6179f39f1d62ebbd6a251f335e0</Sha>
374374
</Dependency>
375-
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24306.2">
375+
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24313.1">
376376
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
377-
<Sha>4d5fd9da36d64d4c3370b8813122e226844fc6ed</Sha>
377+
<Sha>52913b28e20a224a5f6d56fe0b84b13210e274b0</Sha>
378378
</Dependency>
379-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24306.2">
379+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24313.1">
380380
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
381-
<Sha>4d5fd9da36d64d4c3370b8813122e226844fc6ed</Sha>
381+
<Sha>52913b28e20a224a5f6d56fe0b84b13210e274b0</Sha>
382382
</Dependency>
383383
<!-- Intermediate is necessary for source build. -->
384-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.11.0-3.24311.10">
384+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.11.0-3.24313.9">
385385
<Uri>https://github.com/dotnet/roslyn</Uri>
386-
<Sha>f2705c0be613ddc70fb08e1fbef83a204ca92f7e</Sha>
386+
<Sha>0b8371953e61f6179f39f1d62ebbd6a251f335e0</Sha>
387387
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
388388
</Dependency>
389389
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.100-preview.6.24311.23">

‎eng/Versions.props‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@
3434
</ItemGroup>
3535
<PropertyGroup>
3636
<!-- dotnet/roslyn-analyzers dependencies -->
37-
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24306.2</MicrosoftCodeAnalysisAnalyzersVersion>
38-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24306.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
37+
<MicrosoftCodeAnalysisAnalyzersVersion>3.11.0-beta1.24313.1</MicrosoftCodeAnalysisAnalyzersVersion>
38+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24313.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
3939
<!-- dotnet/roslyn dependencies -->
4040
<!--
4141
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.
4242
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
4343
they do not break the local dev experience.
4444
-->
45-
<MicrosoftCodeAnalysisCSharpVersion>4.11.0-3.24311.10</MicrosoftCodeAnalysisCSharpVersion>
46-
<MicrosoftCodeAnalysisVersion>4.11.0-3.24311.10</MicrosoftCodeAnalysisVersion>
47-
<MicrosoftNetCompilersToolsetVersion>4.11.0-3.24311.10</MicrosoftNetCompilersToolsetVersion>
45+
<MicrosoftCodeAnalysisCSharpVersion>4.11.0-3.24313.9</MicrosoftCodeAnalysisCSharpVersion>
46+
<MicrosoftCodeAnalysisVersion>4.11.0-3.24313.9</MicrosoftCodeAnalysisVersion>
47+
<MicrosoftNetCompilersToolsetVersion>4.11.0-3.24313.9</MicrosoftNetCompilersToolsetVersion>
4848
</PropertyGroup>
4949
<!--
5050
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
@@ -179,13 +179,15 @@
179179
<!-- Testing -->
180180
<MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
181181
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
182-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24311.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
183-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24311.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
184-
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24311.2</MicrosoftDotNetXHarnessCLIVersion>
185-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.24303.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
182+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24312.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
183+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24312.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
184+
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24312.3</MicrosoftDotNetXHarnessCLIVersion>
185+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.24312.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
186186
<NUnitVersion>3.12.0</NUnitVersion>
187187
<NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>
188188
<CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
189+
<SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
190+
<JsonSchemaNetVersion>7.0.2</JsonSchemaNetVersion>
189191
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
190192
<NewtonsoftJsonBsonVersion>1.0.2</NewtonsoftJsonBsonVersion>
191193
<SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
@@ -208,11 +210,11 @@
208210
<!-- Docs -->
209211
<MicrosoftPrivateIntellisenseVersion>8.0.0-preview-20230918.1</MicrosoftPrivateIntellisenseVersion>
210212
<!-- Mono Cecil -->
211-
<MicrosoftDotNetCecilVersion>0.11.4-alpha.24230.1</MicrosoftDotNetCecilVersion>
213+
<MicrosoftDotNetCecilVersion>0.11.4-alpha.24313.1</MicrosoftDotNetCecilVersion>
212214
<!-- ILCompiler -->
213215
<MicrosoftDotNetILCompilerVersion>9.0.0-preview.6.24307.2</MicrosoftDotNetILCompilerVersion>
214216
<!-- ICU -->
215-
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-preview.6.24303.1</MicrosoftNETCoreRuntimeICUTransportVersion>
217+
<MicrosoftNETCoreRuntimeICUTransportVersion>9.0.0-preview.6.24312.1</MicrosoftNETCoreRuntimeICUTransportVersion>
216218
<!-- MsQuic -->
217219
<MicrosoftNativeQuicMsQuicSchannelVersion>2.3.5</MicrosoftNativeQuicMsQuicSchannelVersion>
218220
<SystemNetMsQuicTransportVersion>9.0.0-alpha.1.24167.3</SystemNetMsQuicTransportVersion>
@@ -235,9 +237,9 @@
235237
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
236238
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport
237239
-->
238-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.6.24305.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
240+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.6.24317.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
239241
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
240-
<MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version>9.0.0-preview.6.24305.1</MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version>
242+
<MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version>9.0.0-preview.6.24317.1</MicrosoftNETRuntimeEmscripten3134Pythonwinx64Version>
241243
<!-- workloads -->
242244
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
243245
<WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>

‎eng/illink.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<ILLinkRewritePDBs Condition="'$(ILLinkRewritePDBs)' == ''">true</ILLinkRewritePDBs>
3838

3939
<ILLinkResourcesSubstitutionIntermediatePath>$(IntermediateOutputPath)ILLink.Resources.Substitutions.xml</ILLinkResourcesSubstitutionIntermediatePath>
40-
<GenerateResourcesSubstitutions Condition="'$(GenerateResourcesSubstitutions)' == '' and '$(StringResourcesPath)' != ''">true</GenerateResourcesSubstitutions>
40+
<GenerateResourcesSubstitutions Condition="'$(GenerateResourcesSubstitutions)' == '' and '$(StringResourcesPath)' != '' and '$(OmitResources)' != 'true'">true</GenerateResourcesSubstitutions>
4141
</PropertyGroup>
4242

4343
<ItemGroup>
@@ -208,6 +208,7 @@
208208
<!-- trim the target assembly -->
209209
<ILLinkArgs>$(ILLinkArgs) --action link $(TargetName)</ILLinkArgs>
210210
<ILLinkArgs Condition="'$(ILLinkRewritePDBs)' == 'true' and Exists('$(ILLinkTrimAssemblySymbols)')">$(ILLinkArgs) -b true</ILLinkArgs>
211+
<ILLinkArgs Condition="'$(ILLinkRewritePDBs)' == 'true' and Exists('$(ILLinkTrimAssemblySymbols)') and '$(DeterministicSourcePaths)' == 'true'">$(ILLinkArgs) --preserve-symbol-paths</ILLinkArgs>
211212
<!-- pass the non-embedded descriptors xml file on the command line -->
212213
<ILLinkArgs Condition="'$(ILLinkDescriptorsLibraryBuildXml)' != ''">$(ILLinkArgs) -x "$(ILLinkDescriptorsLibraryBuildXml)"</ILLinkArgs>
213214
<ILLinkArgs Condition="'$(ILLinkSubstitutionsLibraryBuildXml)' != ''">$(ILLinkArgs) --substitutions "$(ILLinkSubstitutionsLibraryBuildXml)"</ILLinkArgs>

‎eng/liveBuilds.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
</CoreCLRCrossTargetFiles>
122122
</ItemGroup>
123123
<ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'">
124-
<RuntimeFiles Include="$(MonoArtifactsPath)\*.*" />
124+
<RuntimeFiles Include="$(MonoArtifactsPath)\*.*" Exclude="$(MonoArtifactsPath)\*cdacreader*" />
125125
<RuntimeFiles>
126126
<IsNative>true</IsNative>
127127
</RuntimeFiles>

‎eng/native/configurecompiler.cmake‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -520,11 +520,6 @@ if (CLR_CMAKE_HOST_UNIX)
520520
# Disable frame pointer optimizations so profilers can get better call stacks
521521
add_compile_options(-fno-omit-frame-pointer)
522522

523-
# The -fms-extensions enable the stuff like __declspec(uuid()), etc.
524-
add_compile_options(-fms-extensions)
525-
#-fms-compatibility Enable full Microsoft Visual C++ compatibility
526-
#-fms-extensions Accept some non-standard constructs supported by the Microsoft compiler
527-
528523
# Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around
529524
# using twos-complement representation (this is normally undefined according to the C++ spec).
530525
add_compile_options(-fwrapv)

0 commit comments

Comments
 (0)