From b6ccfab5b704ff1f4a00213e5edd53646154c778 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 11 Jan 2023 06:38:11 -0800 Subject: [PATCH 1/3] .NET Source-Build 6.0.113 January 2023 Updates (#15250) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2a1d564d9..7092f8531 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - <PrivateSourceBuiltArtifactsPackageVersion>6.0.112</PrivateSourceBuiltArtifactsPackageVersion> + <PrivateSourceBuiltArtifactsPackageVersion>6.0.113</PrivateSourceBuiltArtifactsPackageVersion> </PropertyGroup> <!-- Workload manifest package versions --> <PropertyGroup> diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 37a961c91..daee7866a 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.112" + "dotnet": "6.0.113" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From d625ce4fb014d3d6e0d854076359a89fc86230b5 Mon Sep 17 00:00:00 2001 From: Matt Thalman <mthalman@microsoft.com> Date: Wed, 11 Jan 2023 15:34:43 -0600 Subject: [PATCH 2/3] Disable CheckEolTargetFramework for all projects (#15222) --- src/SourceBuild/tarball/content/repos/Directory.Build.props | 3 +++ src/SourceBuild/tarball/content/repos/fsharp.proj | 1 - src/SourceBuild/tarball/content/repos/xliff-tasks.proj | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 100183a09..c178de4ec 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -98,6 +98,9 @@ <EnvironmentVariables Include="DeterministicSourcePaths=false" Condition="'$(DeterministicBuildOptOut)' == 'true'" /> <EnvironmentVariables Include="SourceRoot=$(ProjectDirectory)" /> + + <!-- https://github.com/dotnet/source-build/issues/3081 --> + <EnvironmentVariables Include="CheckEolTargetFramework=false" /> </ItemGroup> <ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'"> diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index 4d00be9ad..a03a69fc5 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -27,7 +27,6 @@ <ItemGroup> <UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" /> - <EnvironmentVariables Include="CheckEolTargetFramework=false" /> </ItemGroup> <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> diff --git a/src/SourceBuild/tarball/content/repos/xliff-tasks.proj b/src/SourceBuild/tarball/content/repos/xliff-tasks.proj index 7964fabdc..a5881adb4 100644 --- a/src/SourceBuild/tarball/content/repos/xliff-tasks.proj +++ b/src/SourceBuild/tarball/content/repos/xliff-tasks.proj @@ -3,8 +3,6 @@ <PropertyGroup> <BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs> - <!-- Repo has netcoreapp2.1 projects: https://github.com/dotnet/xliff-tasks/issues/508 --> - <BuildCommandArgs>$(BuildCommandArgs) /p:CheckEolTargetFramework=false</BuildCommandArgs> <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand> <RepoApiImplemented>false</RepoApiImplemented> From cc5bd785a23386435ff90a6f350115b81d353b08 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 22:23:56 +0000 Subject: [PATCH 3/3] [release/6.0.1xx] Update dependencies from dotnet/arcade (#15263) [release/6.0.1xx] Update dependencies from dotnet/arcade --- NuGet.config | 12 ++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/cross/toolchain.cmake | 7 +++++++ eng/common/templates/steps/source-build.yml | 6 ++++++ global.json | 6 +++--- 6 files changed, 33 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6534504cb..14a0481f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,11 @@ <clear /> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-aspnetcore --> - <add key="darc-int-dotnet-aspnetcore-50b7e9c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-50b7e9c6/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-emsdk --> <add key="darc-pub-dotnet-emsdk-14d64a8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-14d64a81/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-emsdk-14d64a8-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-14d64a81-2/nuget/v3/index.json" /> + <add key="darc-pub-dotnet-emsdk-14d64a8-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-14d64a81-1/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from DotNet-msbuild-Trusted --> <!-- End: Package sources from DotNet-msbuild-Trusted --> @@ -19,9 +20,13 @@ <!-- End: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-templating --> <add key="darc-int-dotnet-templating-960df16" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-960df16f/nuget/v3/index.json" /> + <add key="darc-int-dotnet-templating-960df16-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-960df16f-2/nuget/v3/index.json" /> + <add key="darc-int-dotnet-templating-960df16-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-960df16f-1/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> <add key="darc-int-dotnet-windowsdesktop-397c48f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-397c48f9/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-397c48f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-397c48f9-2/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-397c48f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-397c48f9-1/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" /> @@ -42,16 +47,19 @@ <disabledPackageSources> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!-- Begin: Package sources from dotnet-aspnetcore --> - <add key="darc-int-dotnet-aspnetcore-50b7e9c" value="true" /> <!-- Begin: Package sources from DotNet-msbuild-Trusted --> <!-- End: Package sources from DotNet-msbuild-Trusted --> <!-- End: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-1af80ba" value="true" /> <!-- Begin: Package sources from dotnet-templating --> + <add key="darc-int-dotnet-templating-960df16-1" value="true" /> + <add key="darc-int-dotnet-templating-960df16-2" value="true" /> <add key="darc-int-dotnet-templating-960df16" value="true" /> <!-- End: Package sources from dotnet-templating --> <!-- Begin: Package sources from dotnet-windowsdesktop --> + <add key="darc-int-dotnet-windowsdesktop-397c48f-1" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-397c48f-2" value="true" /> <add key="darc-int-dotnet-windowsdesktop-397c48f" value="true" /> <!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-runtime --> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca15599a1..993e9cbf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22561.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23060.6"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>0967701e5527a1be21d9473821077c3f4be7f9dc</Sha> + <Sha>74b7648c106865057c78ca1e4b2ffcb5e9bce071</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22561.1"> + <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.23060.6"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>0967701e5527a1be21d9473821077c3f4be7f9dc</Sha> + <Sha>74b7648c106865057c78ca1e4b2ffcb5e9bce071</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22561.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23060.6"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>0967701e5527a1be21d9473821077c3f4be7f9dc</Sha> + <Sha>74b7648c106865057c78ca1e4b2ffcb5e9bce071</Sha> </Dependency> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22570.2"> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 7092f8531..abee852d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/arcade --> - <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22561.1</MicrosoftDotNetBuildTasksInstallersPackageVersion> + <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.23060.6</MicrosoftDotNetBuildTasksInstallersPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/winforms --> diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ec8971eb0..51f30e53d 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index abb1b2bcd..b5b3e5aeb 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/global.json b/global.json index 30864f9a7..50c158ed8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.111", + "dotnet": "6.0.113", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22561.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23060.6" } }