Skip to content

Commit 28eb88e

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/android-clr-host-local
* main: System.Net.Http.WinHttpHandler.StartRequestAsync assertion failed (dotnet#109799) Keep test PDB in helix payload for native AOT (dotnet#111949) Build the RID-specific System.IO.Ports packages in the VMR (dotnet#112054) Always inline number conversions (dotnet#112061) Use Contains{Any} in Regex source generator (dotnet#112065) Update dependencies from https://github.com/dotnet/arcade build 20250130.5 (dotnet#112013) JIT: Transform single-reg args to FIELD_LIST in physical promotion (dotnet#111590) Ensure that math calls into the CRT are tracked as needing vzeroupper (dotnet#112011) Use double.ConvertToIntegerNative where safe to do in System.Random (dotnet#112046) JIT: Compute `fgCalledCount` after synthesis (dotnet#112041) Simplify boolean logic in `TimeZoneInfo` (dotnet#112062) JIT: Update type when return temp is freshly created (dotnet#111948) Remove unused build controls and simplify DotNetBuild.props (dotnet#111986) Fix case-insensitive JSON deserialization of enum member names (dotnet#112028) WasmAppBuilder: Remove double computation of a value (dotnet#112047) Disable LTCG for brotli and zlibng. (dotnet#111805) JIT: Improve x86 unsigned to floating cast codegen (dotnet#111595) simplify x86 special intrinsic imports (dotnet#111836) JIT: Try to retain entry weight during profile synthesis (dotnet#111971) Fix explicit offset of ByRefLike fields. (dotnet#111584)
2 parents 21b1ca4 + ad382ca commit 28eb88e

File tree

76 files changed

+1002
-807
lines changed

Some content is hidden

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

76 files changed

+1002
-807
lines changed

‎Directory.Build.props

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,6 @@
190190
<WasmCommonTargetsPath>$([MSBuild]::NormalizeDirectory($(WasmProjectRoot), 'build'))</WasmCommonTargetsPath>
191191
</PropertyGroup>
192192

193-
<PropertyGroup Condition="'$(DotNetBuildRuntimeNativeAOTRuntimePack)' == 'true'">
194-
<BuildNativeAOTRuntimePack>true</BuildNativeAOTRuntimePack>
195-
<SkipLibrariesNativeRuntimePackages>true</SkipLibrariesNativeRuntimePackages>
196-
</PropertyGroup>
197-
198193
<PropertyGroup Condition="'$(DotNetBuildMonoCrossAOT)' == 'true'">
199194
<BuildMonoAOTCrossCompilerOnly>true</BuildMonoAOTCrossCompilerOnly>
200195
<MonoCrossAOTTargetOS>android+browser+wasi</MonoCrossAOTTargetOS>

‎eng/DotNetBuild.props

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,8 @@
3434
<ShortStack Condition="'$(TargetOS)' == 'maccatalyst'">true</ShortStack>
3535
<ShortStack Condition="'$(TargetOS)' == 'android'">true</ShortStack>
3636
<ShortStack Condition="'$(TargetOS)' == 'linux-bionic'">true</ShortStack>
37-
<!-- NativeAOT builds are short -->
38-
<ShortStack Condition="'$(DotNetBuildRuntimeNativeAOTRuntimePack)' == 'true'">true</ShortStack>
3937
<!-- Mono LLVM builds are short -->
4038
<ShortStack Condition="'$(DotNetBuildMonoEnableLLVM)' == 'true' or '$(DotNetBuildMonoAOTEnableLLVM)' == 'true'">true</ShortStack>
41-
<!-- Mono AOT cross compiler builds are short -->
42-
<ShortStack Condition="'$(DotNetBuildMonoCrossAOT)' == 'true'">true</ShortStack>
4339
</PropertyGroup>
4440

4541
<Target Name="GetRuntimeSourceBuildCommandConfiguration"
@@ -72,11 +68,9 @@
7268
<InnerBuildArgs>$(InnerBuildArgs) /p:AdditionalRuntimeIdentifierParent=$(BaseOS) /p:BaseOS=$(BaseOS)</InnerBuildArgs>
7369
<!-- Pass through special build modes controlled by properties -->
7470
<InnerBuildArgs Condition="'$(DotNetBuildRuntimeWasmEnableThreads)' == 'true'">$(InnerBuildArgs) /p:WasmEnableThreads=true</InnerBuildArgs>
75-
<InnerBuildArgs Condition="'$(DotNetBuildRuntimeNativeAOTRuntimePack)' != ''">$(InnerBuildArgs) /p:DotNetBuildRuntimeNativeAOTRuntimePack=$(DotNetBuildRuntimeNativeAOTRuntimePack)</InnerBuildArgs>
7671
<InnerBuildArgs Condition="'$(DotNetBuildMonoEnableLLVM)' != ''">$(InnerBuildArgs) /p:MonoEnableLLVM=$(DotNetBuildMonoEnableLLVM)</InnerBuildArgs>
7772
<InnerBuildArgs Condition="'$(DotNetBuildMonoAOTEnableLLVM)' != ''">$(InnerBuildArgs) /p:MonoAOTEnableLLVM=$(DotNetBuildMonoAOTEnableLLVM)</InnerBuildArgs>
7873
<InnerBuildArgs Condition="'$(DotNetBuildMonoBundleLLVMOptimizer)' != ''">$(InnerBuildArgs) /p:MonoBundleLLVMOptimizer=$(DotNetBuildMonoBundleLLVMOptimizer)</InnerBuildArgs>
79-
<InnerBuildArgs Condition="'$(DotNetBuildMonoCrossAOT)' != ''">$(InnerBuildArgs) /p:DotNetBuildMonoCrossAOT=$(DotNetBuildMonoCrossAOT)</InnerBuildArgs>
8074
<InnerBuildArgs Condition="'$(DotNetBuildAllRuntimePacks)' != ''">$(InnerBuildArgs) /p:DotNetBuildAllRuntimePacks=$(DotNetBuildAllRuntimePacks)</InnerBuildArgs>
8175
<InnerBuildArgs Condition="'$(PgoInstrument)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)pgoinstrument</InnerBuildArgs>
8276

‎eng/Subsets.props

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
<DefaultSubsets Condition="'$(TargetsLinuxBionic)' == 'true' and '$(MonoSupported)' != 'true'">clr.nativeaotruntime+clr.nativeaotlibs+libs+packs</DefaultSubsets>
6767
<!-- In source build, mono is only supported as primary runtime flavor. -->
6868
<DefaultSubsets Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(PrimaryRuntimeFlavor)' != 'Mono'">clr+libs+tools+host+packs</DefaultSubsets>
69-
<DefaultSubsets Condition="'$(DotNetBuildRuntimeNativeAOTRuntimePack)' == 'true'">clr.nativeaotlibs+clr.nativeaotruntime+libs+packs</DefaultSubsets>
7069
<DefaultSubsets Condition="'$(DotNetBuildMonoCrossAOT)' == 'true'">mono+packs</DefaultSubsets>
7170
</PropertyGroup>
7271

@@ -85,7 +84,7 @@
8584
<_subset Condition="'$(Subset)' != ''">+$(Subset.ToLowerInvariant())+</_subset>
8685
<_subset Condition="'$(Subset)' == ''">+$(DefaultSubsets)+</_subset>
8786
</PropertyGroup>
88-
87+
8988

9089
<PropertyGroup Condition="'$(RuntimeFlavor)' == ''">
9190
<RuntimeFlavor Condition="('$(TargetsMobile)' == 'true' or '$(TargetsLinuxBionic)' == 'true') and ($(_subset.Contains('+clr.nativeaotlibs+')) or $(_subset.Contains('+clr.runtime+')))">CoreCLR</RuntimeFlavor>
@@ -605,11 +604,10 @@
605604
</When>
606605
<Otherwise>
607606
<PropertyGroup>
608-
<_BuildCoreCLRRuntimePack Condition="'$(RuntimeFlavor)' == 'CoreCLR' and '$(CoreCLRSupported)' == 'true' and '$(BuildNativeAOTRuntimePack)' != 'true'">true</_BuildCoreCLRRuntimePack>
609-
<_BuildMonoRuntimePack Condition="'$(RuntimeFlavor)' == 'Mono' and '$(MonoSupported)' == 'true' and '$(BuildNativeAOTRuntimePack)' != 'true'">true</_BuildMonoRuntimePack>
610-
<_BuildNativeAOTRuntimePack Condition="'$(BuildNativeAOTRuntimePack)' == 'true'">true</_BuildNativeAOTRuntimePack>
611-
<_BuildHostPack Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true' and '$(BuildNativeAOTRuntimePack)' != 'true'">true</_BuildHostPack>
612-
<_BuildBundle Condition="'$(BuildNativeAOTRuntimePack)' != 'true' and '$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true</_BuildBundle>
607+
<_BuildCoreCLRRuntimePack Condition="'$(RuntimeFlavor)' == 'CoreCLR' and '$(CoreCLRSupported)' == 'true'">true</_BuildCoreCLRRuntimePack>
608+
<_BuildMonoRuntimePack Condition="'$(RuntimeFlavor)' == 'Mono' and '$(MonoSupported)' == 'true'">true</_BuildMonoRuntimePack>
609+
<_BuildHostPack Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true</_BuildHostPack>
610+
<_BuildBundle Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true</_BuildBundle>
613611
</PropertyGroup>
614612

615613
<PropertyGroup Condition="'$(DotNetBuildAllRuntimePacks)' == 'true' and '$(DotNetBuildSourceOnly)' != 'true'">
@@ -632,7 +630,7 @@
632630
<ItemGroup>
633631
<SharedFrameworkProjectToBuild Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Ref.sfxproj" />
634632
</ItemGroup>
635-
<ItemGroup Condition="'$(BuildNativeAOTRuntimePack)' != 'true'">
633+
<ItemGroup>
636634
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono' and ('$(TargetsMobile)' != 'true' and '$(TargetsLinuxBionic)' != 'true')" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
637635
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-host.proj" />
638636
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-hostfxr.proj" />

‎eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -84,87 +84,87 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25079.2">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25080.5">
8888
<Uri>https://github.com/dotnet/arcade</Uri>
89-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
89+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
9090
</Dependency>
9191
<!-- Intermediate is necessary for source build. -->
92-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25079.2">
92+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25080.5">
9393
<Uri>https://github.com/dotnet/arcade</Uri>
94-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
94+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
9595
<SourceBuild RepoName="arcade" ManagedOnly="true" />
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25079.2">
97+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25080.5">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
99+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25079.2">
101+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25080.5">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
103+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25079.2">
105+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25080.5">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
107+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25079.2">
109+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25080.5">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
111+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25079.2">
113+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25080.5">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
115+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25079.2">
117+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25080.5">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
119+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25079.2">
121+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25080.5">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
123+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25079.2">
125+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25080.5">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
127+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25079.2">
129+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25080.5">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
131+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25079.2">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25080.5">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
135+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25079.2">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25080.5">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
139+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25079.2">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25080.5">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
143+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25079.2">
145+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25080.5">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
147+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25079.2">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25080.5">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
151+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25079.2">
153+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25080.5">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
155+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25079.2">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25080.5">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
159+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25079.2">
161+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25080.5">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
163+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25079.2">
165+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25080.5">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
167+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
168168
</Dependency>
169169
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25070.2">
170170
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -348,9 +348,9 @@
348348
<Uri>https://github.com/dotnet/xharness</Uri>
349349
<Sha>3119edb6d70fb252e6128b0c7e45d3fc2f49f249</Sha>
350350
</Dependency>
351-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25079.2">
351+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25080.5">
352352
<Uri>https://github.com/dotnet/arcade</Uri>
353-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
353+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
354354
</Dependency>
355355
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25067.2">
356356
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,22 @@
8585
<!-- SDK dependencies (also used in wasm build tests -->
8686
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.25077.2</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
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>
88+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25080.5</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25080.5</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25080.5</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25080.5</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25080.5</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25080.5</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25080.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25080.5</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25080.5</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25080.5</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25080.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25080.5</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25080.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25080.5</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25080.5</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25080.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 -->

‎eng/native/configurecompiler.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,17 +127,13 @@ if (MSVC)
127127
add_linker_flag(/OPT:NOICF CHECKED)
128128

129129
# Release build specific flags
130-
add_linker_flag(/LTCG RELEASE)
131130
add_linker_flag(/OPT:REF RELEASE)
132131
add_linker_flag(/OPT:ICF RELEASE)
133132
add_linker_flag(/INCREMENTAL:NO RELEASE)
134-
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG")
135133

136134
# ReleaseWithDebugInfo build specific flags
137-
add_linker_flag(/LTCG RELWITHDEBINFO)
138135
add_linker_flag(/OPT:REF RELWITHDEBINFO)
139136
add_linker_flag(/OPT:ICF RELWITHDEBINFO)
140-
set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
141137

142138
elseif (CLR_CMAKE_HOST_UNIX)
143139
# Set the values to display when interactively configuring CMAKE_BUILD_TYPE

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "10.0.100-alpha.1.25077.2"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25079.2",
12-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25079.2",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25079.2",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25080.5",
12+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25080.5",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25080.5",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25068.1"

0 commit comments

Comments
 (0)