Skip to content

Commit ab70886

Browse files
dotnet-maestro[bot]akoeplingerViktorHoferpavelsavara
authored
[main] Source code updates from dotnet/dotnet (#116145)
* [VMR] Codeflow cb502bd-cb502bd [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 270084 No dependency updates to commit * Rename wasm test file to fix WasmBuildTest failure * Disable DynamicObjects test * Update dependencies from https://github.com/dotnet/dotnet build 270315 Updated Dependencies: System.CommandLine (Version 2.0.0-beta5.25279.110 -> 2.0.0-beta5.25279.2) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25279.110 -> 0.11.5-alpha.25260.104) Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport, Microsoft.DotNet.ApiCompat.Task (Version 10.0.100-preview.6.25279.110 -> 10.0.100-preview.5.25260.104) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.XUnitExtensions, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.PackageTesting (Version 10.0.0-beta.25279.110 -> 10.0.0-beta.25260.104) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.2-beta.25279.110 -> 2.9.2-beta.25260.104) Microsoft.NETCore.App.Runtime.win-x64, runtime.native.System.IO.Ports, Microsoft.NETCore.ILAsm, Microsoft.NET.Sdk.IL, System.Text.Json, System.Reflection.Metadata, System.Reflection.MetadataLoadContext (Version 10.0.0-preview.6.25279.110 -> 10.0.0-preview.5.25260.104) Microsoft.Net.Compilers.Toolset, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-1.25279.110 -> 5.0.0-1.25260.104) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25279.110 -> 10.0.0-preview.25260.104) * ActiveIssue #116303 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Alexander Köplinger <[email protected]> Co-authored-by: Viktor Hofer <[email protected]> Co-authored-by: Pavel Savara <[email protected]>
1 parent a16df1d commit ab70886

File tree

36 files changed

+812
-362
lines changed

36 files changed

+812
-362
lines changed

Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@
192192
<CheckEolTargetFramework>false</CheckEolTargetFramework>
193193
<!-- Turn off workload support until we support them. -->
194194
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
195+
<!-- Turn off producing Windows PDBs from our portable PDBs. No one uses them and they slow down publishing. -->
196+
<PublishWindowsPdb>false</PublishWindowsPdb>
195197
<!-- Disable source link when building locally. -->
196198
<DisableSourceLink Condition="'$(DisableSourceLink)' == '' and
197199
'$(ContinuousIntegrationBuild)' != 'true' and

Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
<PropertyGroup>
7171
<!-- Define properties that depend on the host SDK RID here. -->
72-
<BuildHostTools Condition="'$(DotNetBuildOrchestrator)' == 'true' and '$(TargetRid)' != '$(NETCoreSdkRuntimeIdentifier)'">true</BuildHostTools>
72+
<BuildHostTools Condition="'$(DotNetBuildFromVMR)' == 'true' and '$(TargetRid)' != '$(NETCoreSdkRuntimeIdentifier)'">true</BuildHostTools>
7373
<BuildHostILTools Condition="'$(BuildHostTools)' == 'true' and $([MSBuild]::IsOsPlatform(Windows))">true</BuildHostILTools>
7474
</PropertyGroup>
7575

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
2626
if is_cygwin_or_mingw; then
2727
# if bash shell running on Windows (not WSL),
2828
# pass control to batch build script.
29-
"$scriptroot/build.cmd" $@
29+
"$scriptroot/build.cmd" "$@"
3030
else
31-
"$scriptroot/eng/build.sh" $@
31+
"$scriptroot/eng/build.sh" "$@"
3232
fi

eng/Publishing.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
We can't use NETCoreSdkRuntimeIdentifier here as the Arcade SDK projects don't import the .NET SDK.
1616
Instead, just make sure we include the assets targeting "not the output rid", which will catch the host assets.
1717
-->
18-
<ItemGroup Condition="'$(EnableDefaultRidSpecificArtifacts)' != 'true' and '$(DotNetBuildOrchestrator)' == 'true'">
18+
<ItemGroup Condition="'$(EnableDefaultRidSpecificArtifacts)' != 'true' and '$(DotNetBuildFromVMR)' == 'true'">
1919
<_HostArtifact Include="$(ArtifactsPackagesDir)**\runtime.*.Microsoft.NETCore.ILAsm.*.nupkg"
2020
Exclude="$(ArtifactsPackagesDir)**\runtime.$(TargetRid).Microsoft.NETCore.ILAsm.*.nupkg" />
2121

@@ -51,7 +51,7 @@
5151
This ensures that we don't produce these files in the "Repo source build" builds,
5252
but we do produce them in both the VMR and the runtime official build.
5353
-->
54-
<PropertyGroup Condition="'$(DotNetBuildOrchestrator)' == 'true'">
54+
<PropertyGroup Condition="'$(DotNetBuildFromVMR)' == 'true'">
5555
<ShouldGenerateProductVersionFiles Condition="'$(TargetRid)' == 'win-x64' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">true</ShouldGenerateProductVersionFiles>
5656
<ShouldGenerateProductVersionFiles Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</ShouldGenerateProductVersionFiles>
5757
</PropertyGroup>
@@ -89,12 +89,12 @@
8989
DependsOnTargets="GetNonStableProductVersion"
9090
BeforeTargets="PublishToAzureDevOpsArtifacts"
9191
AfterTargets="GenerateChecksumsFromArtifacts">
92-
<ItemGroup Condition="'$(DotNetBuildOrchestrator)' == 'true'">
92+
<ItemGroup Condition="'$(DotNetBuildFromVMR)' == 'true'">
9393
<Artifact Condition="'%(Artifact.Kind)' != 'Package' and '%(Artifact.RelativeBlobPath)' == ''"
9494
RelativeBlobPath="Runtime/$(NonStableProductVersion)/%(Artifact.SubBlobFolder)%(Filename)%(Extension)" />
9595
</ItemGroup>
9696
<!-- In vertical dotnet/runtime legs outside of the VMR, set the "relative blob path" to shipping vs non-shipping to make our download/upload work. -->
97-
<ItemGroup Condition="'$(DotNetBuildOrchestrator)' != 'true'">
97+
<ItemGroup Condition="'$(DotNetBuildFromVMR)' != 'true'">
9898
<Artifact Condition="'%(Artifact.Kind)' == 'Blob' and '%(Artifact.IsShipping)' == 'true'"
9999
RelativeBlobPath="packages/$(Configuration)/Shipping/%(Filename)%(Extension)" />
100100
<Artifact Condition="'%(Artifact.Kind)' == 'Blob' and '%(Artifact.IsShipping)' != 'true'"

eng/Signing.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<EnableBlobArtifacts Condition="'$(MonoAOTEnableLLVM)' == 'true'">false</EnableBlobArtifacts>
2424

2525
<!-- The final stage of the runtime official build should publish everything. -->
26-
<EnableDefaultRidSpecificArtifacts Condition="'$(EnableDefaultRidSpecificArtifacts)' == '' and '$(DotNetBuildOrchestrator)' != 'true'">true</EnableDefaultRidSpecificArtifacts>
26+
<EnableDefaultRidSpecificArtifacts Condition="'$(EnableDefaultRidSpecificArtifacts)' == '' and '$(DotNetBuildFromVMR)' != 'true'">true</EnableDefaultRidSpecificArtifacts>
2727

2828
<UseDotNetCertificate>true</UseDotNetCertificate>
2929
</PropertyGroup>
@@ -41,7 +41,7 @@
4141

4242
<!-- On MacOS, we need to sign a number of our executables with the Mac developer cert with hardening enabled.
4343
Avoid doing this on Linux, which has the same executable names -->
44-
<FileSignInfo Condition="'$(TargetsOSX)' == 'true'" Include="dotnet;apphost;corerun;createdump;singlefilehost;crossgen2;ilasm;ilc;ildasm;llc;mono-aot-cross;opt;Mono" CertificateName="MacDeveloperHarden" />
44+
<FileSignInfo Condition="'$(TargetsOSX)' == 'true'" Include="dotnet;apphost;createdump;singlefilehost;crossgen2" CertificateName="MacDeveloperHarden" />
4545
<!-- Additionally, we need to notarize any .pkg files -->
4646
<MacOSPkg Include="$(ArtifactsPackagesDir)**/dotnet-runtime*.pkg" Exclude="$(ArtifactsPackagesDir)**/dotnet-runtime-internal*.pkg" />
4747
<FileSignInfo Include="@(MacOSPkg->'%(Filename)%(Extension)')" CertificateName="MacDeveloperWithNotarization" />

eng/Subsets.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</PropertyGroup>
8484

8585
<PropertyGroup>
86-
<!-- If we're building in the VMR, then we want to build all of the assets even in a PGO-instrumented build as downstream repos will not be able to pull assets from a matching non-PGO-instrumented build. -->
86+
<!-- In .NET product build mode we want to build all of the assets even in a PGO-instrumented build as downstream repos will not be able to pull assets from a matching non-PGO-instrumented build. -->
8787
<BuildOnlyPgoInstrumentedAssets Condition="'$(PgoInstrument)' == 'true' and '$(DotNetBuild)' != 'true'">true</BuildOnlyPgoInstrumentedAssets>
8888
</PropertyGroup>
8989

0 commit comments

Comments
 (0)