diff --git a/Build.proj b/Build.proj index baa240685ae..0957ae6846e 100644 --- a/Build.proj +++ b/Build.proj @@ -8,7 +8,7 @@ - + diff --git a/Directory.Build.props b/Directory.Build.props index 0db4a1cc3d3..26e112fab56 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,12 +5,12 @@ false - true + leg only, so we also take DotNetBuildSourceOnly into account. --> + true - true + true @@ -94,7 +94,7 @@ net8.0 - $(NetCoreAppCurrent) + $(NetCoreAppCurrent) - - - + + + 8.0.0 @@ -176,7 +176,7 @@ $([MSBuild]::NormalizePath('$(MonoTargetsTasksDir)', 'MonoTargetsTasks.dll')) $([MSBuild]::NormalizePath('$(TestExclusionListTasksDir)', 'TestExclusionListTasks.dll')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(TargetOS).$(TargetArchitecture).$(RuntimeConfiguration)')) - $(CoreCLRToolPath) + $(CoreCLRToolPath) $(WASMTIME_PATH) $([MSBuild]::NormalizeDirectory($(ArtifactsObjDir), 'wasmtime')) true @@ -184,7 +184,7 @@ - false + false true @@ -298,8 +298,8 @@ - true - false + true + false true true @@ -380,7 +380,7 @@ portable true - true + true false Properties diff --git a/Directory.Build.targets b/Directory.Build.targets index 43564d36255..f731eedc390 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -21,7 +21,7 @@ When .NET gets built from source, make the SDK aware there are bootstrap packages for Microsoft.NETCore.App.Runtime. and Microsoft.NETCore.App.Crossgen2.. --> - + %(RuntimePackRuntimeIdentifiers);$(PackageRID) @@ -88,7 +88,7 @@ - $(SystemReflectionMetadataLoadContextVersion) + $(SystemReflectionMetadataLoadContextVersion) - false + false $(RunAnalyzers) diff --git a/eng/DiaSymReaderNative.targets b/eng/DiaSymReaderNative.targets index caa482f4b6e..ac8dc7e36a0 100644 --- a/eng/DiaSymReaderNative.targets +++ b/eng/DiaSymReaderNative.targets @@ -18,7 +18,7 @@ package can't be referenced directly but rather has to have it's assets manually copied out. This logic is responsible for doing that. --> - + PreserveNewest false diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props index fbad52bdac7..8527ec175ad 100644 --- a/eng/DotNetBuild.props +++ b/eng/DotNetBuild.props @@ -38,9 +38,9 @@ - + $(InnerBuildArgs) $(FlagParameterPrefix)arch $(TargetArch) $(InnerBuildArgs) $(FlagParameterPrefix)os $(TargetOS) $(InnerBuildArgs) $(FlagParameterPrefix)cross @@ -63,8 +63,7 @@ $(InnerBuildArgs) $(FlagParameterPrefix)s clr.nativeaotlibs+clr.nativeaotruntime+libs+packs /p:BuildNativeAOTRuntimePack=true /p:SkipLibrariesNativeRuntimePackages=true - $(InnerBuildArgs) /p:ArcadeBuildFromSource=true - $(InnerBuildArgs) /p:ArcadeBuildVertical=true + $(InnerBuildArgs) /p:DotNetBuildRepo=true $(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId) $(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild) $(InnerBuildArgs) /p:PortableBuild=$(PortableBuild) diff --git a/eng/Subsets.props b/eng/Subsets.props index 9088b48f285..cd4532699b1 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -40,7 +40,7 @@ mono+libs+packs mono+libs+host+packs - clr+libs+tools+host+packs + clr+libs+tools+host+packs @@ -85,13 +85,13 @@ tools.illink host.native+host.tools+host.pkg - $(DefaultHostSubsets)+host.pretest+host.tests + $(DefaultHostSubsets)+host.pretest+host.tests host.native packs.product - $(DefaultPacksSubsets)+packs.tests - $(DefaultPacksSubsets)+packs.installers + $(DefaultPacksSubsets)+packs.tests + $(DefaultPacksSubsets)+packs.installers $(DefaultPacksSubsets)+mono.manifests @@ -341,7 +341,7 @@ $(CoreClrProjectRoot)tools\aot\ILCompiler\repro\repro.csproj; $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj; $(CoreClrProjectRoot)tools\PdbChecker\PdbChecker.csproj; - $(CoreClrProjectRoot)tools\AssemblyChecker\AssemblyChecker.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/> + $(CoreClrProjectRoot)tools\AssemblyChecker\AssemblyChecker.csproj" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true'"/> @@ -355,11 +355,11 @@ + Test="true" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true'"/> + Test="true" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(NativeAotSupported)' == 'true'"/> + Test="true" Category="clr" Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(NativeAotSupported)' == 'true'"/> @@ -393,7 +393,7 @@ - + diff --git a/eng/Tools.props b/eng/Tools.props index 01cae1f2b23..3baa40f4f32 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -11,7 +11,7 @@ - + diff --git a/eng/Versions.props b/eng/Versions.props index 29ede69058e..ea03f538ca3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ true true - - true + + true diff --git a/eng/codeOptimization.targets b/eng/codeOptimization.targets index d42a39e3dfd..5f990a98347 100644 --- a/eng/codeOptimization.targets +++ b/eng/codeOptimization.targets @@ -30,7 +30,7 @@ - true + true diff --git a/eng/nativepgo.targets b/eng/nativepgo.targets index 9f5984efdb6..99344e20b8e 100644 --- a/eng/nativepgo.targets +++ b/eng/nativepgo.targets @@ -9,7 +9,7 @@ <_NativeOptimizationDataPackageTarget Condition="'$(TargetOS)' == 'windows'">windows_nt-$(TargetArchitecture.ToLower()) - + diff --git a/eng/packaging.targets b/eng/packaging.targets index fde0ccb624b..554e705e188 100644 --- a/eng/packaging.targets +++ b/eng/packaging.targets @@ -4,12 +4,12 @@ true + '$(DotNetBuildSourceOnly)' != 'true'">true true + '$(DotNetBuildSourceOnly)' == 'true'">true $(ApiCompatNetCoreAppBaselineVersion) $(BeforePack);IncludeAnalyzersInPackage;AddNETStandardCompatErrorFileForPackaging @@ -39,7 +39,7 @@ true + '$(DotNetBuildSourceOnly)' == 'true'">true false @@ -307,7 +307,7 @@ diff --git a/eng/resolveContract.targets b/eng/resolveContract.targets index bd6fc7de7fc..fb93fcd09e9 100644 --- a/eng/resolveContract.targets +++ b/eng/resolveContract.targets @@ -76,7 +76,7 @@ all the inputs available, some suppressions might only apply to one or the other and hence unnecessary suppressions can't be determined. Disable the validation under source build as that might use an out-of-date SDK and not the ApiCompat.Task package. --> - + true true @@ -137,7 +137,7 @@ Version="$(MicrosoftDotNetGenApiVersion)" PrivateAssets="all" IsImplicitlyDefined="true" - Condition="'$(DotNetBuildFromSource)' != 'true'" /> + Condition="'$(DotNetBuildSourceOnly)' != 'true'" /> diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj index 9db169fb6da..f240269e0ad 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj @@ -16,7 +16,7 @@ false Debug;Release;Checked false - $(NoWarn);CS8524 + $(NoWarn);CS8524 @@ -24,7 +24,7 @@ - + all contentfiles diff --git a/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj b/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj index 268e2e6b124..663dadfd936 100644 --- a/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj +++ b/src/coreclr/tools/aot/ILCompiler.TypeSystem/ILCompiler.TypeSystem.csproj @@ -9,7 +9,7 @@ x64;x86 AnyCPU false - true + true $(DefineConstants);DISABLE_UNMANAGED_PDB_SYMBOLS - false + false false false diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props index 6b419773911..70994509d40 100644 --- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props +++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props @@ -47,10 +47,10 @@ true - true + true - + diff --git a/src/coreclr/tools/r2rdump/R2RDump.csproj b/src/coreclr/tools/r2rdump/R2RDump.csproj index 103d8160d0b..3f5a93c94fb 100644 --- a/src/coreclr/tools/r2rdump/R2RDump.csproj +++ b/src/coreclr/tools/r2rdump/R2RDump.csproj @@ -15,7 +15,7 @@ false - + diff --git a/src/installer/pkg/projects/Directory.Build.props b/src/installer/pkg/projects/Directory.Build.props index 2917964afb8..a07b360efc0 100644 --- a/src/installer/pkg/projects/Directory.Build.props +++ b/src/installer/pkg/projects/Directory.Build.props @@ -35,7 +35,7 @@ true - false + false dotnet-crossgen2 crossgen2 - linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;freebsd-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64 + linux-x64;linux-musl-x64;linux-arm;linux-musl-arm;linux-arm64;linux-musl-arm64;freebsd-x64;freebsd-arm64;osx-x64;osx-arm64;win-x64;win-x86;win-arm64 false tools/ true @@ -21,7 +21,7 @@ false - false + false diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index 988b59bcece..1f6b5503802 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -19,7 +19,7 @@ true - true + true diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj index 085cade3966..28d8bcddd18 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj @@ -44,7 +44,7 @@ Microsoft.Extensions.Logging.Abstractions.NullLogger + Condition="'$(DotNetBuildSourceOnly)' != 'true'" /> diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj index 958cf0e65df..24aa038645a 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj +++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj index 40351864618..16d83c57fe4 100644 --- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj +++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj @@ -161,7 +161,7 @@ + '$(DotNetBuildSourceOnly)' != 'true'"> + '$(DotNetBuildSourceOnly)' != 'true'"> - + diff --git a/src/libraries/oob-all.proj b/src/libraries/oob-all.proj index 07b063fab40..b8d20924522 100644 --- a/src/libraries/oob-all.proj +++ b/src/libraries/oob-all.proj @@ -29,7 +29,7 @@ + Condition="'$(DotNetBuildSourceOnly)' == 'true'" /> diff --git a/src/libraries/oob-src.proj b/src/libraries/oob-src.proj index bb571ebc35f..48bc4897a26 100644 --- a/src/libraries/oob-src.proj +++ b/src/libraries/oob-src.proj @@ -37,7 +37,7 @@ + Condition="'$(DotNetBuildSourceOnly)' == 'true'" /> diff --git a/src/libraries/oob.proj b/src/libraries/oob.proj index 34823cd1ba4..d49efa6e616 100644 --- a/src/libraries/oob.proj +++ b/src/libraries/oob.proj @@ -13,7 +13,7 @@ + Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(ApiCompatValidateAssemblies)' != 'false'" /> diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index ec9b4a7706a..42afa2ece4f 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -99,8 +99,8 @@ - - + + diff --git a/src/mono/nuget/mono-packages.proj b/src/mono/nuget/mono-packages.proj index 025c6666db7..10add92c17e 100644 --- a/src/mono/nuget/mono-packages.proj +++ b/src/mono/nuget/mono-packages.proj @@ -30,7 +30,7 @@ - + diff --git a/src/tasks/WorkloadBuildTasks/WorkloadBuildTasks.csproj b/src/tasks/WorkloadBuildTasks/WorkloadBuildTasks.csproj index 4e91a40280c..50249f07c44 100644 --- a/src/tasks/WorkloadBuildTasks/WorkloadBuildTasks.csproj +++ b/src/tasks/WorkloadBuildTasks/WorkloadBuildTasks.csproj @@ -2,7 +2,7 @@ $(NetCoreAppToolCurrent) - $(TargetFrameworks);net8.0 + $(TargetFrameworks);net8.0 enable $(NoWarn),CA1050,CA1850 diff --git a/src/tasks/tasks.proj b/src/tasks/tasks.proj index ab54991791b..504f3caad09 100644 --- a/src/tasks/tasks.proj +++ b/src/tasks/tasks.proj @@ -6,7 +6,7 @@ + Condition="'$(DotNetBuildSourceOnly)' == 'true'" /> true diff --git a/src/tools/illink/src/ILLink.CodeFix/ILLink.CodeFixProvider.csproj b/src/tools/illink/src/ILLink.CodeFix/ILLink.CodeFixProvider.csproj index 3771de91b84..5dd13cb7772 100644 --- a/src/tools/illink/src/ILLink.CodeFix/ILLink.CodeFixProvider.csproj +++ b/src/tools/illink/src/ILLink.CodeFix/ILLink.CodeFixProvider.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/tools/illink/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj b/src/tools/illink/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj index 80fd6a90220..7db05c1cde9 100644 --- a/src/tools/illink/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj +++ b/src/tools/illink/src/ILLink.RoslynAnalyzer/ILLink.RoslynAnalyzer.csproj @@ -7,7 +7,7 @@ false false Latest - $(NoWarn);CS8524 + $(NoWarn);CS8524 cs @@ -16,9 +16,9 @@ - - - + + + all contentfiles diff --git a/src/tools/illink/src/linker/Mono.Linker.csproj b/src/tools/illink/src/linker/Mono.Linker.csproj index e5cdbb86c5e..d1a4bdbf057 100644 --- a/src/tools/illink/src/linker/Mono.Linker.csproj +++ b/src/tools/illink/src/linker/Mono.Linker.csproj @@ -15,7 +15,7 @@ true false - $(NoWarn);CS8524 + $(NoWarn);CS8524 $(MSBuildThisFileDirectory)ref\Mono.Linker.csproj Major false @@ -76,7 +76,7 @@ - + all contentfiles @@ -84,7 +84,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all