diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 2e6b0b2bc..5d0247741 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -16,7 +16,6 @@ variables: value: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-DotNetCli-Storage - - group: DotNet-Blob-Feed - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true @@ -54,11 +53,11 @@ stages: agentOs: Windows_NT pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool - queue: buildpool.windows.10.amd64.vs2019.open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals build.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2019 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals build.windows.10.amd64.vs2019 timeoutInMinutes: 180 strategy: matrix: @@ -111,11 +110,11 @@ stages: agentOs: Windows_NT pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool - queue: buildpool.windows.10.amd64.vs2019.open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals build.windows.10.amd64.vs2019.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCoreInternal-Pool - queue: buildpool.windows.10.amd64.vs2019 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals build.windows.10.amd64.vs2019 timeoutInMinutes: 180 strategy: matrix: @@ -140,11 +139,11 @@ stages: agentOs: Linux pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool - queue: BuildPool.Ubuntu.1604.Amd64.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCoreInternal-Pool - queue: BuildPool.Ubuntu.1604.Amd64 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 timeoutInMinutes: 180 strategy: matrix: @@ -312,11 +311,11 @@ stages: agentOs: Linux pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool - queue: BuildPool.Ubuntu.1604.Amd64.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCoreInternal-Pool - queue: BuildPool.Ubuntu.1604.Amd64 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 timeoutInMinutes: 180 strategy: matrix: diff --git a/Directory.Build.props b/Directory.Build.props index 35439d3b3..c373c9beb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,6 +10,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) + $(BuildArchitecture) x64 diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 7d8f6cdee..d32a7f3e1 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,9 +9,9 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.19 - 10.0.18362.19 - 10.0.19041.19 - 10.0.20348.19 + 10.0.17763.21 + 10.0.18362.21 + 10.0.19041.21 + 10.0.20348.21 diff --git a/eng/SourceBuild.Version.Details.xml b/eng/SourceBuild.Version.Details.xml deleted file mode 100644 index 220b3996a..000000000 --- a/eng/SourceBuild.Version.Details.xml +++ /dev/null @@ -1,220 +0,0 @@ - - - - - https://github.com/dotnet/windowsdesktop - 189cf3a060ffbae53057f3ab4d3be94dfbb61ea8 - - - https://github.com/dotnet/windowsdesktop - 189cf3a060ffbae53057f3ab4d3be94dfbb61ea8 - - - https://github.com/dotnet/windowsdesktop - 189cf3a060ffbae53057f3ab4d3be94dfbb61ea8 - - - https://github.com/dotnet/runtime - 06b23ba6edae9c1eeef4df5e84b33433617c22d1 - - - - https://github.com/dotnet/runtime - 06b23ba6edae9c1eeef4df5e84b33433617c22d1 - - - https://github.com/dotnet/runtime - 06b23ba6edae9c1eeef4df5e84b33433617c22d1 - - - https://github.com/dotnet/runtime - 06b23ba6edae9c1eeef4df5e84b33433617c22d1 - - - https://github.com/dotnet/runtime - 06b23ba6edae9c1eeef4df5e84b33433617c22d1 - - - - - https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 - - - https://github.com/dotnet/runtime - 06b23ba6edae9c1eeef4df5e84b33433617c22d1 - - - https://github.com/dotnet/aspnetcore - e259201568807d84788ae0f6187e84361c18ece1 - - - https://github.com/dotnet/aspnetcore - e259201568807d84788ae0f6187e84361c18ece1 - - - https://github.com/dotnet/aspnetcore - e259201568807d84788ae0f6187e84361c18ece1 - - - https://github.com/dotnet/aspnetcore - e259201568807d84788ae0f6187e84361c18ece1 - - - - https://github.com/dotnet/aspnetcore - e259201568807d84788ae0f6187e84361c18ece1 - - - https://github.com/dotnet/aspnetcore - e259201568807d84788ae0f6187e84361c18ece1 - - - https://github.com/dotnet/test-templates - baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - - - https://github.com/dotnet/test-templates - baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - - - https://github.com/dotnet/test-templates - baf4b38e4f1dbc637efdb41624acbe05b2ff9f35 - - - - https://github.com/dotnet/templating - 79209eac8a27bcabf5a064a88abb95f32b91d863 - - - - https://github.com/dotnet/sdk - 34151f8401ef08249f6a55f6565eb72895482fdf - - - - https://github.com/dotnet/sdk - 34151f8401ef08249f6a55f6565eb72895482fdf - - - - https://github.com/dotnet/winforms - cd98a8c4d79bef1cb02de7890cd3f7d020ac713c - - - https://github.com/dotnet/wpf - 0e9cf5b6c744fc5b02db738dfc66a43fb3f79b77 - - - https://github.com/dotnet/fsharp - b0a54707064024f8959e54027e9e5d8fe49e82c7 - - - https://github.com/dotnet/fsharp - b0a54707064024f8959e54027e9e5d8fe49e82c7 - - - - https://github.com/microsoft/vstest - d6f64b37c2cfee76c8b1269d688384ced30ecd21 - - - - https://github.com/mono/linker - c8499798a2a09639174e2f5c694d6652794cc73d - - linker - - - https://github.com/dotnet/roslyn - dae39045cd460ba44053ff2af2217da126c25dbf - - - - https://github.com/dotnet/msbuild - a9594b978ca1157af28ffffa79b9ce1ad39c5874 - - - - https://github.com/nuget/nuget.client - f82431ecc38a28f396d527446834c7de679a6722 - - - - https://github.com/Microsoft/ApplicationInsights-dotnet - 53b80940842204f78708a538628288ff5d741a1d - - - https://github.com/dotnet/xdt - 37469b9f38e7a56be04621f77b12a51ef49c1074 - - - - https://github.com/dotnet/emsdk - 9838ec0843442f761488cfec9cf34612c9f675e6 - - - https://github.com/dotnet/source-build - ca07d8763334fa66011ed496d444d68355fb9511 - - - - - - https://github.com/dotnet/clicommandlineparser - 3198bf5660cad3dab85f5475bf1fda9688146e3f - - - - https://github.com/dotnet/command-line-api - bd9c63c9e74681617fccf2e371cd90f00d01cef7 - - - - https://github.com/dotnet/diagnostics - e0189ea53737fbb0cc110dab56c260ef2a6f5b74 - - - - https://github.com/dotnet/symreader - dd6b71744be8cdbfd69117e96f5b9e64a7b38b6e - - - - https://github.com/dotnet/deployment-tools - 01f1b60fc5405dbb5579fa9b01702e29b0ed4ddf - - - - - - https://github.com/dotnet/arcade - 474307e526160c813c9fd58060eb8356ccca6099 - - - - https://github.com/dotnet/arcade - 474307e526160c813c9fd58060eb8356ccca6099 - - - - https://github.com/dotnet/arcade - 474307e526160c813c9fd58060eb8356ccca6099 - - - https://github.com/dotnet/source-build-reference-packages - 896532ec53ea317e3136ad3849ef1944a31b9f6b - - - - https://github.com/dotnet/sourcelink - 6dcc7d005e38829efb6714d2ecfc4c0cb383e7d9 - - - - https://github.com/dotnet/xliff-tasks - 22d8cfd8807ba8e4f2e32eeb9f207010ca5e6f6d - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3d5c26b0..955f7d6b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -154,9 +154,10 @@ 53b80940842204f78708a538628288ff5d741a1d - - https://github.com/aspnet/xdt - c01a538851a8ab1a1fbeb2e6243f391fff7587b4 + + https://github.com/dotnet/xdt + 698fdad58fa64a55f16cd9562c90224cc498ed02 + https://github.com/dotnet/emsdk @@ -167,6 +168,26 @@ 3fb25b8db3bec654e37e71a5b2b7fde14444bc2f + + https://github.com/dotnet/clicommandlineparser + 3198bf5660cad3dab85f5475bf1fda9688146e3f + + + + https://github.com/dotnet/deployment-tools + 7431bf2f3c204cbbc326c8d55ce4ac5cad7661d6 + + + + https://github.com/dotnet/diagnostics + f758ec93e1098e5bcbc4550f8a36c6cd1ce04918 + + + + https://github.com/dotnet/symreader + 7b9791daa3a3477eb22ec805946c9fff8b42d8ca + + @@ -183,9 +204,10 @@ https://github.com/dotnet/arcade c575da80f465e0b5fb98f416be92bb98b2f54b41 - + https://github.com/dotnet/source-build-reference-packages - 896532ec53ea317e3136ad3849ef1944a31b9f6b + f5558f1481f841e318e301d9cb7dd6f0fe4dd64e + https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index d45f483d5..51a5c2901 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -105,7 +105,7 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 3.14.0-dotnet + 1.0.0-v3.14.0.4118 @@ -159,17 +159,17 @@ removed. See https://github.com/dotnet/source-build/issues/2295 --> 15.7.179 15.7.179 - 0.1.0-6.0.100-bootstrap.16 - 0.1.0-6.0.100-19 + 0.1.0-6.0.100-bootstrap.19 + 0.1.0-6.0.100-23 - 6.0.100-rc.1.1351 - 30.0.100-rc.1.137 - 15.0.100-rc.1.496 - 15.0.100-rc.1.496 - 12.0.100-rc.1.496 - 15.0.100-rc.1.496 + 6.0.101-preview.9.1805 + 31.0.101-preview.9.16 + 15.0.101-preview.9.31 + 15.0.101-preview.9.31 + 12.0.101-preview.9.31 + 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) 6.0.0-rc.2.21474.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index a19be2933..428271393 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -6,17 +6,25 @@ jobs: displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool - queue: BuildPool.Ubuntu.1604.Amd64.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCoreInternal-Pool - queue: BuildPool.Ubuntu.1604.Amd64 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 variables: _BuildConfig: Release workspace: clean: all steps: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: | set -x df -h @@ -52,7 +60,7 @@ jobs: # This prevents allocation of additional agents if the tarball build legs should be skipped. # Only build the tarball if the PR touches source-build source. - script: | - if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*\|"filename": "eng/SourceBuild.Version.Details.xml"' + if curl "https://api.github.com/repos/dotnet/installer/pulls/$(System.PullRequest.PullRequestNumber)/files" | grep '"filename": "src/SourceBuild/*' then echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true" fi diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 7c97439bd..a6d2f8690 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -17,21 +17,20 @@ jobs: dependsOn: ${{ parameters.dependsOn }} pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCorePublic-Pool - queue: BuildPool.Ubuntu.1604.Amd64.Open + name: NetCore1ESPool-Svc-Public + demands: ImageOverride -equals Build.Ubuntu.1604.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCoreInternal-Pool - queue: BuildPool.Ubuntu.1604.Amd64 + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1604.Amd64 strategy: matrix: Fedora33-Online: _runOnline: true _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 - # TODO: Renable once installer prebuilts are eliminated. - # Fedora33-Offline: - # _runOnline: false - # _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 - timeoutInMinutes: 180 + Fedora33-Offline: + _runOnline: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + timeoutInMinutes: 210 variables: _TarballDir: $(Build.StagingDirectory)/tarball _BuildConfig: Release diff --git a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs index fbd497b72..59f7eb499 100644 --- a/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs +++ b/src/SourceBuild/Arcade/src/Tarball_ReadSourceBuildIntermediateNupkgDependencies.cs @@ -59,8 +59,14 @@ namespace Microsoft.DotNet.SourceBuild.Tasks if (sourceBuildElement == null) { - // Ignore element: doesn't represent a source-build dependency. - return null; + // Workaround for https://github.com/dotnet/source-build/issues/2481 + sourceBuildElement = d.Element(CreateQualifiedName("SourceBuildTarball")); + + if (sourceBuildElement == null) + { + // Ignore element: doesn't represent a source-build dependency. + return null; + } } string repoName = sourceBuildElement.Attribute("RepoName")?.Value; diff --git a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs index 9792857d3..b6b2793f3 100644 --- a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs +++ b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs @@ -104,16 +104,8 @@ namespace Microsoft.DotNet.SourceBuild.Tasks var releaseParts = nugetVersion.Release.Split('-', '.'); if (releaseParts.Length == 2) { - if (releaseParts[1].TrimStart('0') == commitCount) - { - // core-sdk does this - OfficialBuildId is only used for their fake package and not in anything shipped - return new DerivedVersion { OfficialBuildId = DateTime.Now.ToString("yyyyMMdd.1"), PreReleaseVersionLabel = releaseParts[0] }; - } - else - { - // NuGet does this - arbitrary build IDs - return new DerivedVersion { OfficialBuildId = releaseParts[1], PreReleaseVersionLabel = releaseParts[0] }; - } + // NuGet does this - arbitrary build IDs + return new DerivedVersion { OfficialBuildId = DateTime.Now.ToString("yyyyMMdd.1"), PreReleaseVersionLabel = releaseParts[0] }; } else if (releaseParts.Length == 3) { diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index dfa256387..f07718f1a 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -13,7 +13,8 @@ - $(RepoRoot)artifacts/tarball/ + $(RepoRoot)artifacts/ + $(ArtifactsDir)tarball/ $([MSBuild]::EnsureTrailingSlash('$(TarballDir)')) $(TarballRootDir)src/ $(TarballRootDir)git-info/ @@ -28,6 +29,8 @@ SetupSelfGithubInfo; CloneRepoAndDependentsRecursive; CleanClonedSource; + RestoreTextOnlyPackages; + CopyTextOnlyPackages; CopyTarballContent; "> @@ -139,6 +142,12 @@ WorkingDirectory="$(RepoRoot)" Condition="$(IsRootRepo) == 'true'" /> + + + + WorkingDirectory="$(TarballRepoSourceDir).git" + Condition="$(PreserveTarballGitFolders) != 'true'" /> - - + + + + + + + + + + + $(ArtifactsDir)text-only-packages/ + $(TarballRootDir)packages/text-only/ + + + + + + + @@ -269,4 +303,42 @@ + + + + + + + + + + + + + + + $([System.IO.Path]::GetFileName('$(TextOnlyDirectory)')) + + + + + + + + + + diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj new file mode 100644 index 000000000..3b45c1bef --- /dev/null +++ b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj @@ -0,0 +1,68 @@ + + + net6.0 + $(TargetPackagesPath) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @(TextOnlyPackagesDirectories) + + + + + \ No newline at end of file diff --git a/src/SourceBuild/tarball/content/ArcadeOverrides/AfterSourceBuild.proj b/src/SourceBuild/tarball/content/ArcadeOverrides/AfterSourceBuild.proj index f9ea30ab1..141743561 100644 --- a/src/SourceBuild/tarball/content/ArcadeOverrides/AfterSourceBuild.proj +++ b/src/SourceBuild/tarball/content/ArcadeOverrides/AfterSourceBuild.proj @@ -150,7 +150,7 @@ SourceBuildArcadeTargetsFile=$(MSBuildThisFileDirectory)SourceBuildArcade.targets; SourceBuildIntermediateNupkgLicenseFile=$(SourceBuildIntermediateNupkgLicenseFile); " - BuildInParallel="true"/> + BuildInParallel="false"/> diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index f6a195464..51f8e3c5a 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -18,6 +18,7 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) $(BuildArchitecture) + $(BuildArchitecture) x64 false @@ -44,7 +45,6 @@ $([MSBuild]::NormalizeDirectory('$(DOTNET_INSTALL_DIR)')) $(ProjectDir).dotnet/ $(DotNetCliToolDir)dotnet - $(ProjectDir)patches/ $(NuGetPackageRoot) $(ProjectDir)packages/restored/ $(PackagesDir)ArcadeBootstrapPackage/ @@ -232,13 +232,13 @@ - + - + - - - + + + diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props index 34a90269c..b27697389 100644 --- a/src/SourceBuild/tarball/content/eng/Versions.props +++ b/src/SourceBuild/tarball/content/eng/Versions.props @@ -21,8 +21,8 @@ - 0.1.0-6.0.100-bootstrap.16 + 0.1.0-6.0.100-bootstrap.19 0.1.0-6.0.100- - 19 + 23 diff --git a/src/SourceBuild/tarball/content/patches/arcade/0001-Update-TFM-to-net6.0.patch b/src/SourceBuild/tarball/content/patches/arcade/0001-Update-TFM-to-net6.0.patch deleted file mode 100644 index 7c444cd7e..000000000 --- a/src/SourceBuild/tarball/content/patches/arcade/0001-Update-TFM-to-net6.0.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 5288390142a40beb392f5e11380b370ab696830c Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 21 Jul 2021 21:10:15 +0000 -Subject: [PATCH] Update TFM to net6.0 - -When building from source, only the current TFM is built. Update -TargetFrameworks to only have net6.0. ---- - eng/TargetFrameworkDefaults.props | 2 +- - .../Microsoft.DotNet.Deployment.Tasks.Links.csproj | 2 +- - .../tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj | 2 +- - .../Microsoft.DotNet.GenFacades.csproj | 1 + - .../Microsoft.DotNet.PackageTesting.csproj | 1 + - .../Microsoft.DotNet.SharedFramework.Sdk.csproj | 1 + - src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj | 2 +- - .../tasks/Microsoft.DotNet.VersionTools.Tasks.csproj | 2 +- - 8 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/eng/TargetFrameworkDefaults.props b/eng/TargetFrameworkDefaults.props -index 89f2a8eb..ca3546e8 100644 ---- a/eng/TargetFrameworkDefaults.props -+++ b/eng/TargetFrameworkDefaults.props -@@ -6,7 +6,7 @@ - --> - - netcoreapp3.1 -- net5.0 -+ net6.0 - - - -diff --git a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj -index 30474e21..c964fbea 100644 ---- a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj -+++ b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj -@@ -3,7 +3,7 @@ - - - netcoreapp3.1;net472 -- netcoreapp3.1 -+ net6.0 - - true - Aka.ms link manager -diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj -index 6a1cee07..e01890c8 100644 ---- a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj -+++ b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj -@@ -2,7 +2,7 @@ - - - net472;netcoreapp3.1 -- netcoreapp3.1 -+ net6.0 - - true - MSBuildSdk -diff --git a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj -index db51ae17..bca9958d 100644 ---- a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj -+++ b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj -@@ -2,6 +2,7 @@ - - - $(TargetFrameworkForNETSDK);net472 -+ $(TargetFrameworkForNETSDK) - MSBuildSdk - false - true -diff --git a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj -index 2f35e4aa..dfe69f4c 100644 ---- a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj -+++ b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj -@@ -2,6 +2,7 @@ - - - netcoreapp3.1;net472 -+ net6.0 - MSBuildSdk - false - true -diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj -index 4405a1fe..a93edfaa 100644 ---- a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj -+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj -@@ -2,6 +2,7 @@ - - - net472;netcoreapp3.1 -+ net6.0 - preview - false - -diff --git a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj -index 8ec571ae..7a89dfe9 100644 ---- a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj -+++ b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj -@@ -2,7 +2,7 @@ - - - net472;netcoreapp3.1 -- netcoreapp3.1 -+ net6.0 - true - Latest - true -diff --git a/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj b/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj -index 208ffb03..2dfa124f 100644 ---- a/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj -+++ b/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj -@@ -2,7 +2,7 @@ - - - net472;netcoreapp3.1 -- netcoreapp3.1 -+ net6.0 - MSBuildSdk - - --- -2.31.1 - diff --git a/src/SourceBuild/tarball/content/patches/arcade/0002-Exclude-test-projects-from-source-build.patch b/src/SourceBuild/tarball/content/patches/arcade/0002-Exclude-test-projects-from-source-build.patch deleted file mode 100644 index 67bbb7be1..000000000 --- a/src/SourceBuild/tarball/content/patches/arcade/0002-Exclude-test-projects-from-source-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9531b8ea8fab44bf8b9b19c64c393e0d2d5907c4 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 21 Jul 2021 22:07:46 +0000 -Subject: [PATCH 1/2] Exclude test projects from source-build - ---- - .../Microsoft.Arcade.Common.Tests.csproj | 1 + - .../Microsoft.Arcade.Test.Common.csproj | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj b/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj -index 653588d2..98b20958 100644 ---- a/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj -+++ b/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj -@@ -3,6 +3,7 @@ - - netcoreapp3.1 - enable -+ true - - - -diff --git a/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj b/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj -index bb3c5eeb..bcc3d717 100644 ---- a/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj -+++ b/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj -@@ -3,6 +3,7 @@ - - netcoreapp3.1;net472 - true -+ true - - - --- -2.31.1 - diff --git a/src/SourceBuild/tarball/content/patches/arcade/0003-Remove-net472-TFM.patch b/src/SourceBuild/tarball/content/patches/arcade/0003-Remove-net472-TFM.patch deleted file mode 100644 index e34352c51..000000000 --- a/src/SourceBuild/tarball/content/patches/arcade/0003-Remove-net472-TFM.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 63ab09a985b91f4b30a58dc113abc65d34298a12 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 21 Jul 2021 22:09:10 +0000 -Subject: [PATCH 2/2] Remove net472 TFM - ---- - .../Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj b/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj -index 324725f5..ac04f517 100644 ---- a/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj -+++ b/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj -@@ -2,6 +2,7 @@ - - - net472;netstandard2.0 -+ netstandard2.0 - true - - --- -2.31.1 - diff --git a/src/SourceBuild/tarball/content/patches/arcade/0004-Use-property-instead-of-hardcoded-version.patch b/src/SourceBuild/tarball/content/patches/arcade/0004-Use-property-instead-of-hardcoded-version.patch deleted file mode 100644 index aea25220b..000000000 --- a/src/SourceBuild/tarball/content/patches/arcade/0004-Use-property-instead-of-hardcoded-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 05673a6eb5004131cd42eda6d372e94c1dfb3165 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Wed, 21 Jul 2021 22:25:51 +0000 -Subject: [PATCH] Use property instead of hardcoded version - ---- - .../src/Microsoft.DotNet.Build.Tasks.Packaging.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj -index 31562d59..200fd507 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj -@@ -89,7 +89,7 @@ - - - <_candidatePackageFolder>%(_candidatPackageFolders.Identity) -- <_runtimeJsonSubPath>Microsoft.NETCore.Platforms\2.1.0\runtime.json -+ <_runtimeJsonSubPath>Microsoft.NETCore.Platforms\$(MicrosoftNETCorePlatformsVersion)\runtime.json - <_runtimeJsonPath Condition="'$(_runtimeJsonPath)' == '' AND Exists('$(_candidatePackageFolder)\$(_runtimeJsonSubPath)')">$(_candidatePackageFolder)\$(_runtimeJsonSubPath) - <_runtimeJsonPath Condition="'$(_runtimeJsonPath)' == '' AND Exists('$(_candidatePackageFolder)\$(_runtimeJsonSubPath.ToLower())')">$(_candidatePackageFolder)\$(_runtimeJsonSubPath.ToLower()) - --- -2.31.1 - diff --git a/src/SourceBuild/tarball/content/patches/deployment-tools/0001-remove-unnecessary-pvp-import.patch b/src/SourceBuild/tarball/content/patches/deployment-tools/0001-remove-unnecessary-pvp-import.patch deleted file mode 100644 index 9a636f683..000000000 --- a/src/SourceBuild/tarball/content/patches/deployment-tools/0001-remove-unnecessary-pvp-import.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 44e69209ab5f641104815da7fcad063e923115af Mon Sep 17 00:00:00 2001 -From: Logan Bussell <36081148+lbussell@users.noreply.github.com> -Date: Thu, 19 Aug 2021 22:37:59 +0000 -Subject: [PATCH] remove unnecessary pvp import - ---- - eng/Versions.props | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index aa896af..2a62eb2 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -142,6 +142,4 @@ - Microsoft.NETCore.Targets - Microsoft.NETCore.Runtime.CoreCLR - -- -- - --- -2.30.2 - diff --git a/src/SourceBuild/tarball/content/patches/diagnostics/0001-Remove-netcoreapp2.1-TFM.patch b/src/SourceBuild/tarball/content/patches/diagnostics/0001-Remove-netcoreapp2.1-TFM.patch deleted file mode 100644 index f2a7ff29d..000000000 --- a/src/SourceBuild/tarball/content/patches/diagnostics/0001-Remove-netcoreapp2.1-TFM.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 80ac1836aa29bce1c8de0fbc920dd83e57ff8d37 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 27 Aug 2021 01:56:03 +0000 -Subject: [PATCH] Remove netcoreapp2.1 TFM - ---- - .../Microsoft.Diagnostics.NETCore.Client.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj -index ffba4a8a..40dd2361 100644 ---- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj -+++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj -@@ -1,7 +1,7 @@ -  - - Library -- netstandard2.0;netcoreapp2.1 -+ netstandard2.0 - Microsoft.Diagnostics.NETCore.Client - .NET Core Diagnostics Client Library - 0.2.0 --- -2.29.2 - diff --git a/src/SourceBuild/tarball/content/patches/roslyn-analyzers/0001-NoWarn-NU1605-until-previous-soure-built-is-updated.patch b/src/SourceBuild/tarball/content/patches/roslyn-analyzers/0001-NoWarn-NU1605-until-previous-soure-built-is-updated.patch deleted file mode 100644 index 8eb8a04f5..000000000 --- a/src/SourceBuild/tarball/content/patches/roslyn-analyzers/0001-NoWarn-NU1605-until-previous-soure-built-is-updated.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c0054516699c82ae2778cfef2391b054c803bcda Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 8 Sep 2021 22:30:07 +0000 -Subject: [PATCH] NoWarn NU1605 until previous soure built is updated - ---- - Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 2abead734..0447353dd 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -40,7 +40,7 @@ - CS1591: Missing XML comment for publicly visible type or member 'Type_or_Member' - CS1712: Type parameter 'parameter' has no matching typeparam tag in the XML comment on 'type_or_member' (but other type parameters do) - --> -- $(NoWarn),1573,1591,1712 -+ $(NoWarn),1573,1591,1712;NU1605 - - - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/content/patches/roslyn-analyzers/0002-Exclude-test-projects-from-source-build.patch b/src/SourceBuild/tarball/content/patches/roslyn-analyzers/0002-Exclude-test-projects-from-source-build.patch deleted file mode 100644 index d9f55f3b2..000000000 --- a/src/SourceBuild/tarball/content/patches/roslyn-analyzers/0002-Exclude-test-projects-from-source-build.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 937bb35e1eaedd2a1030997ad8cb5c65f82eaff0 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Mon, 13 Sep 2021 15:09:22 +0000 -Subject: [PATCH] Exclude test projects from source-build - ---- - .../Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj | 1 + - src/Test.Utilities/Test.Utilities.csproj | 1 + - src/TestReferenceAssembly/TestReferenceAssembly.csproj | 1 + - src/Utilities.UnitTests/Analyzer.Utilities.UnitTests.csproj | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/src/PerformanceTests/Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj b/src/PerformanceTests/Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj -index 802a57603..5d3a45354 100644 ---- a/src/PerformanceTests/Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj -+++ b/src/PerformanceTests/Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj -@@ -4,6 +4,7 @@ - net6.0 - false - true -+ true - - - -diff --git a/src/Test.Utilities/Test.Utilities.csproj b/src/Test.Utilities/Test.Utilities.csproj -index 2ed633389..0540d0d09 100644 ---- a/src/Test.Utilities/Test.Utilities.csproj -+++ b/src/Test.Utilities/Test.Utilities.csproj -@@ -3,6 +3,7 @@ - - netcoreapp3.1;net472 - true -+ true - - - -diff --git a/src/TestReferenceAssembly/TestReferenceAssembly.csproj b/src/TestReferenceAssembly/TestReferenceAssembly.csproj -index b1d18e913..614c58ef9 100644 ---- a/src/TestReferenceAssembly/TestReferenceAssembly.csproj -+++ b/src/TestReferenceAssembly/TestReferenceAssembly.csproj -@@ -4,5 +4,6 @@ - netstandard2.0;net46 - OtherDll - true -+ true - - -\ No newline at end of file -diff --git a/src/Utilities.UnitTests/Analyzer.Utilities.UnitTests.csproj b/src/Utilities.UnitTests/Analyzer.Utilities.UnitTests.csproj -index 7aa61f992..baddd5d66 100644 ---- a/src/Utilities.UnitTests/Analyzer.Utilities.UnitTests.csproj -+++ b/src/Utilities.UnitTests/Analyzer.Utilities.UnitTests.csproj -@@ -4,6 +4,7 @@ - netcoreapp3.1;net472 - true - true -+ true - - - --- -2.31.1 - diff --git a/src/SourceBuild/tarball/content/patches/runtime/0001-Exclude-ILStrip-from-source-build.patch b/src/SourceBuild/tarball/content/patches/runtime/0001-Exclude-ILStrip-from-source-build.patch deleted file mode 100644 index 8a095a011..000000000 --- a/src/SourceBuild/tarball/content/patches/runtime/0001-Exclude-ILStrip-from-source-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b8e5f85d42b61d29701ace6907e3f320f868bae7 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 8 Sep 2021 15:22:00 +0000 -Subject: [PATCH] Exclude ILStrip from source-build - -Underlying issue is tracked by https://github.com/dotnet/source-build/issues/2438. ExcludeFromSourceBuild as a temporary solution as the project is not currently required. ---- - src/tasks/ILStripTask/ILStrip.csproj | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/tasks/ILStripTask/ILStrip.csproj b/src/tasks/ILStripTask/ILStrip.csproj -index 879c56f26ae..0ad46c08191 100644 ---- a/src/tasks/ILStripTask/ILStrip.csproj -+++ b/src/tasks/ILStripTask/ILStrip.csproj -@@ -4,6 +4,7 @@ - Library - true - false -+ true - $(NoWarn),CA1050,CS0618,CS0649,CS8604,CS8602,CS8632,SYSLIB0003 - false - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/content/patches/runtime/0002-Disable-WasmAppBuilder-PublishBuilder-for-source-bui.patch b/src/SourceBuild/tarball/content/patches/runtime/0002-Disable-WasmAppBuilder-PublishBuilder-for-source-bui.patch deleted file mode 100644 index 56bd55fb5..000000000 --- a/src/SourceBuild/tarball/content/patches/runtime/0002-Disable-WasmAppBuilder-PublishBuilder-for-source-bui.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3638f46d82289dee4d87b82190e3ef67105b4c56 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 8 Sep 2021 16:15:49 +0000 -Subject: [PATCH] Disable WasmAppBuilder PublishBuilder for source-build - -Temporary until https://github.com/dotnet/runtime/issues/58816 is resolved. ---- - src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -index 3c93ab5d643..9e325bfcbf4 100644 ---- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj -@@ -24,7 +24,8 @@ - - - -+ AfterTargets="Build" -+ Condition="'$(DotNetBuildFromSource)' != 'true'"> - - - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/content/patches/runtime/0002-msquic-source-build-patches.patch b/src/SourceBuild/tarball/content/patches/runtime/0002-msquic-source-build-patches.patch deleted file mode 100644 index 797a46c56..000000000 --- a/src/SourceBuild/tarball/content/patches/runtime/0002-msquic-source-build-patches.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d3e43d32095172d29f101fe20694822399c3ad1b Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 8 Sep 2021 19:22:01 +0000 -Subject: [PATCH] msquic source-build patches - -Backport of changes to support msquic in source-build - https://github.com/dotnet/runtime/pull/58651 ---- - .../pkg/sfx/Microsoft.NETCore.App/Directory.Build.props | 2 +- - src/libraries/System.Net.Quic/src/System.Net.Quic.csproj | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props -index 19c48f2ec85..63f5649ec6a 100644 ---- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props -+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props -@@ -161,7 +161,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 4549842ee8e..3fc0bb3a6c1 100644 ---- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj -+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj -@@ -127,7 +127,7 @@ - - - -- - - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/content/patches/sdk/0001-Change-Compatibility-projects-TargetFrameworks.patch b/src/SourceBuild/tarball/content/patches/sdk/0001-Change-Compatibility-projects-TargetFrameworks.patch deleted file mode 100644 index 836ee2c60..000000000 --- a/src/SourceBuild/tarball/content/patches/sdk/0001-Change-Compatibility-projects-TargetFrameworks.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b1e8b42bfe073813258e8143931199b5883e9123 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 8 Sep 2021 22:00:23 +0000 -Subject: [PATCH] Change Compatibility projects' TargetFrameworks - -Addresses the following errors: -error NU1202: Package NuGet.Packaging 6.0.0-preview.4.32767 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package NuGet.Packaging 6.0.0-preview.4.32767 supports: net6.0 ---- - .../Microsoft.DotNet.Compatibility.csproj | 1 + - .../Microsoft.DotNet.PackageValidation.csproj | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj -index f9f8e4632..92624be84 100644 ---- a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj -+++ b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj -@@ -2,6 +2,7 @@ - - - net6.0;net472 -+ net6.0 - true - true - Open -diff --git a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -index 4241f4577..7a8b64865 100644 ---- a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -+++ b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj -@@ -2,6 +2,7 @@ - - - net6.0;net472 -+ net6.0 - Open - - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/content/patches/symreader/0002-Exclude-PdbTest-project-from-source-build.patch b/src/SourceBuild/tarball/content/patches/symreader/0002-Exclude-PdbTest-project-from-source-build.patch deleted file mode 100644 index 406e4ac16..000000000 --- a/src/SourceBuild/tarball/content/patches/symreader/0002-Exclude-PdbTest-project-from-source-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1cb584fab0d95a87418b884856c12ccc55ea0a95 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Fri, 10 Sep 2021 13:47:05 +0000 -Subject: [PATCH] Exclude PdbTest project from source-build - ---- - src/PdbTestResources/PdbTestResources.csproj | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/PdbTestResources/PdbTestResources.csproj b/src/PdbTestResources/PdbTestResources.csproj -index 1376ddf..21f45b3 100644 ---- a/src/PdbTestResources/PdbTestResources.csproj -+++ b/src/PdbTestResources/PdbTestResources.csproj -@@ -3,6 +3,7 @@ - - netstandard1.3 - false -+ true - - - -@@ -18,4 +19,4 @@ - SourceLink.pdb - - -- -\ No newline at end of file -+ --- -2.31.1 - diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index fdeb2c137..64536436d 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -63,16 +63,6 @@ - - - - - - - diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index bd1db193e..f7bf1d2bd 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -70,26 +70,6 @@ - - - - - - - - git --work-tree=$(ProjectDirectory) apply --ignore-whitespace --whitespace=nowarn - - - - - - - - $(BuildCommandArgs) /p:CheckEolTargetFramework=false $(ProjectDirectory)eng\common\build$(ShellExtension) $(BuildCommandArgs) $(ProjectDirectory)global.json diff --git a/src/SourceBuild/tarball/content/repos/linker.proj b/src/SourceBuild/tarball/content/repos/linker.proj index 37023037e..eb0fecf74 100644 --- a/src/SourceBuild/tarball/content/repos/linker.proj +++ b/src/SourceBuild/tarball/content/repos/linker.proj @@ -18,26 +18,6 @@ - - - - diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index 07a5f39ae..19cde5400 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -33,6 +33,9 @@ case $cpuName in i686) buildArch=x86 ;; + s390x) + buildArch=s390x + ;; *) echo "Unknown CPU $cpuName detected, treating it as x64" buildArch=x64 @@ -165,8 +168,11 @@ function doCommand() { echo "starting language $lang, type $proj" | tee -a smoke-test.log dotnetCmd=${dotnetDir}/dotnet - mkdir "${lang}_${proj}" - cd "${lang}_${proj}" + + # rename '#'' to 'Sharp' to workaround https://github.com/dotnet/aspnetcore/issues/36900 + projectDir="${lang//"#"/"Sharp"}_${proj}" + mkdir "${projectDir}" + cd "${projectDir}" newArgs="new $proj -lang $lang" @@ -200,7 +206,7 @@ function doCommand() { binlogHttpsPart="https" fi - binlogPrefix="$testingDir/${lang}_${proj}_${binlogOnlinePart}_${binlogHttpsPart}_" + binlogPrefix="$testingDir/${projectDir}_${binlogOnlinePart}_${binlogHttpsPart}_" binlog="${binlogPrefix}$1.binlog" echo " running $1" | tee -a "$logFile" @@ -270,7 +276,7 @@ function doCommand() { cd .. if [ "$keepProjects" == "false" ]; then - rm -rf "${lang}_${proj}" + rm -rf "${projectDir}" fi echo "finished language $lang, type $proj" | tee -a smoke-test.log diff --git a/src/SourceBuild/tarball/content/smoke-testNuGet.Config b/src/SourceBuild/tarball/content/smoke-testNuGet.Config index 07754412d..7dee71e3e 100644 --- a/src/SourceBuild/tarball/content/smoke-testNuGet.Config +++ b/src/SourceBuild/tarball/content/smoke-testNuGet.Config @@ -15,5 +15,6 @@ + diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index 56b486024..3835e019c 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -24,7 +24,7 @@ BuildXPlatTasks; ExtractToolPackage; GenerateRootFs; - ApplyPatches; + BuildTextOnlyPackages; PoisonPrebuiltPackages" /> @@ -58,7 +58,7 @@ - @@ -108,17 +108,6 @@ - - - - - - - - - - - @@ -133,6 +122,13 @@ + + + + - diff --git a/src/SourceBuild/tarball/content/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch b/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch rename to src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch diff --git a/src/SourceBuild/tarball/content/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch b/src/SourceBuild/tarball/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch rename to src/SourceBuild/tarball/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch diff --git a/src/SourceBuild/tarball/content/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch b/src/SourceBuild/tarball/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch rename to src/SourceBuild/tarball/patches/arcade/0007-Respond-to-WorkloadDefinition-breaking-API-change.patch diff --git a/src/SourceBuild/tarball/content/patches/arcade/0008-Bootstrapping-workaround.patch b/src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/arcade/0008-Bootstrapping-workaround.patch rename to src/SourceBuild/tarball/patches/arcade/0008-Bootstrapping-workaround.patch diff --git a/src/SourceBuild/tarball/content/patches/aspnetcore/0003-Exclude-warnings-as-errors-from-source-build.patch b/src/SourceBuild/tarball/patches/aspnetcore/0003-Exclude-warnings-as-errors-from-source-build.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/aspnetcore/0003-Exclude-warnings-as-errors-from-source-build.patch rename to src/SourceBuild/tarball/patches/aspnetcore/0003-Exclude-warnings-as-errors-from-source-build.patch diff --git a/src/SourceBuild/tarball/content/patches/aspnetcore/0004-Revert-sourcelink-submodule-workaround.patch b/src/SourceBuild/tarball/patches/aspnetcore/0004-Revert-sourcelink-submodule-workaround.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/aspnetcore/0004-Revert-sourcelink-submodule-workaround.patch rename to src/SourceBuild/tarball/patches/aspnetcore/0004-Revert-sourcelink-submodule-workaround.patch diff --git a/src/SourceBuild/tarball/content/patches/clicommandlineparser/0001-Remove-installation-of-runtime-2.1.0-from-build.sh.patch b/src/SourceBuild/tarball/patches/clicommandlineparser/0001-Remove-installation-of-runtime-2.1.0-from-build.sh.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/clicommandlineparser/0001-Remove-installation-of-runtime-2.1.0-from-build.sh.patch rename to src/SourceBuild/tarball/patches/clicommandlineparser/0001-Remove-installation-of-runtime-2.1.0-from-build.sh.patch diff --git a/src/SourceBuild/tarball/content/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch rename to src/SourceBuild/tarball/patches/nuget-client/0001-Don-t-use-PublicApiAnalyzer-on-source-build.patch diff --git a/src/SourceBuild/tarball/content/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch b/src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch rename to src/SourceBuild/tarball/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch diff --git a/src/SourceBuild/tarball/content/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch b/src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch rename to src/SourceBuild/tarball/patches/nuget-client/0003-Use-source-built-Microsoft.Web.Xdt-System.ComponentM.patch diff --git a/src/SourceBuild/tarball/content/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch b/src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch rename to src/SourceBuild/tarball/patches/nuget-client/0005-Build-script-changes-to-support-ArPow-from-tarball.patch diff --git a/src/SourceBuild/tarball/content/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch b/src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch rename to src/SourceBuild/tarball/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch diff --git a/src/SourceBuild/tarball/content/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch b/src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch rename to src/SourceBuild/tarball/patches/nuget-client/0007-Build-NuGet.Frameworks-for-netstandard-as-well-for-V.patch diff --git a/src/SourceBuild/tarball/content/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch b/src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch rename to src/SourceBuild/tarball/patches/nuget-client/0008-NuGet.Build.Tasks.Pack-source-build-support.patch diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0003-Upgrade-Newtonsoft.Json-to-13.0.1.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0003-Upgrade-Newtonsoft.Json-to-13.0.1.patch new file mode 100644 index 000000000..0d2ee7a96 --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0003-Upgrade-Newtonsoft.Json-to-13.0.1.patch @@ -0,0 +1,25 @@ +From fa733a5a26776c793477b4404bc670e5a8e94260 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 24 Sep 2021 17:58:20 +0000 +Subject: [PATCH 1/2] Upgrade Newtonsoft.Json to 13.0.1 + +--- + eng/Versions.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index c418a1205..cb27118fb 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -67,7 +67,7 @@ + 6.0.0-preview.4.21253.7 + 10.1.0 + 16.1.8 +- 12.0.1 ++ 13.0.1 + 0.2.1 + 1.1.2 + 2.0.0-beta1.20074.1 +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/patches/roslyn-analyzers/0004-Exclude-perfdiff-and-test-project-when-building-from.patch b/src/SourceBuild/tarball/patches/roslyn-analyzers/0004-Exclude-perfdiff-and-test-project-when-building-from.patch new file mode 100644 index 000000000..c23e3aaba --- /dev/null +++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0004-Exclude-perfdiff-and-test-project-when-building-from.patch @@ -0,0 +1,42 @@ +From 0b40797eab5933ae0d9dd48e4b8b0ec03d712ca5 Mon Sep 17 00:00:00 2001 +From: dseefeld +Date: Fri, 24 Sep 2021 17:58:56 +0000 +Subject: [PATCH 2/2] Exclude perfdiff and test project when building from + source + +--- + src/Tools/PerfDiff/PerfDiff.csproj | 1 + + .../Tests/RulesetToEditorconfigConverter.UnitTests.csproj | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/Tools/PerfDiff/PerfDiff.csproj b/src/Tools/PerfDiff/PerfDiff.csproj +index 7a829e12e..44279f1f9 100644 +--- a/src/Tools/PerfDiff/PerfDiff.csproj ++++ b/src/Tools/PerfDiff/PerfDiff.csproj +@@ -4,6 +4,7 @@ + Exe + net6.0 + true ++ true + + + +diff --git a/src/Tools/RulesetToEditorconfigConverter/Tests/RulesetToEditorconfigConverter.UnitTests.csproj b/src/Tools/RulesetToEditorconfigConverter/Tests/RulesetToEditorconfigConverter.UnitTests.csproj +index 027ca2b09..46fff2f30 100644 +--- a/src/Tools/RulesetToEditorconfigConverter/Tests/RulesetToEditorconfigConverter.UnitTests.csproj ++++ b/src/Tools/RulesetToEditorconfigConverter/Tests/RulesetToEditorconfigConverter.UnitTests.csproj +@@ -4,8 +4,9 @@ + netcoreapp3.1;net472 + true + false ++ true + + + + +- +\ No newline at end of file ++ +-- +2.31.1 + diff --git a/src/SourceBuild/tarball/content/patches/roslyn/0001-Patch-out-version-check-for-source-build-scenarios.patch b/src/SourceBuild/tarball/patches/roslyn/0001-Patch-out-version-check-for-source-build-scenarios.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/roslyn/0001-Patch-out-version-check-for-source-build-scenarios.patch rename to src/SourceBuild/tarball/patches/roslyn/0001-Patch-out-version-check-for-source-build-scenarios.patch diff --git a/src/SourceBuild/tarball/content/patches/roslyn/0002-Don-t-include-desktop-artifacts-that-don-t-exist-in-.patch b/src/SourceBuild/tarball/patches/roslyn/0002-Don-t-include-desktop-artifacts-that-don-t-exist-in-.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/roslyn/0002-Don-t-include-desktop-artifacts-that-don-t-exist-in-.patch rename to src/SourceBuild/tarball/patches/roslyn/0002-Don-t-include-desktop-artifacts-that-don-t-exist-in-.patch diff --git a/src/SourceBuild/tarball/content/patches/runtime/0003-Mark-System.Reflection.Metadata-with-PrivateAssets.patch b/src/SourceBuild/tarball/patches/runtime/0003-Mark-System.Reflection.Metadata-with-PrivateAssets.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/runtime/0003-Mark-System.Reflection.Metadata-with-PrivateAssets.patch rename to src/SourceBuild/tarball/patches/runtime/0003-Mark-System.Reflection.Metadata-with-PrivateAssets.patch diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch new file mode 100644 index 000000000..3980fe5f8 --- /dev/null +++ b/src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch @@ -0,0 +1,68 @@ +From 242806d708f4fff996e17185b570bd7d5d934a74 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Tue, 28 Sep 2021 15:45:44 +0000 +Subject: [PATCH] Rename DeploymentReleasesVersion Versions.props entry to + align with Arcade naming convention + +Backported to SDK with https://github.com/dotnet/sdk/pull/21502 +--- + eng/Versions.props | 2 +- + src/Cli/dotnet/dotnet.csproj | 2 +- + .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 2 +- + .../Microsoft.DotNet.NativeWrapper.csproj | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 0a7442c7c4..741b654ec4 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -36,7 +36,7 @@ + 4.0.5 + 5.0.2 + 6.0.0-rc.2.21470.23 +- 1.0.0-preview1.1.21112.1 ++ 1.0.0-preview1.1.21112.1 + 4.6.0 + 2.0.0-beta1.21417.2 + +diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj +index b27862fb9d..539e127a63 100644 +--- a/src/Cli/dotnet/dotnet.csproj ++++ b/src/Cli/dotnet/dotnet.csproj +@@ -93,7 +93,7 @@ + + + +- ++ + + + +diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +index de9c3d5cd2..cf53c33fe5 100644 +--- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj ++++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +@@ -56,7 +56,7 @@ + + + +- ++ + + + +diff --git a/src/Resolvers/Microsoft.DotNet.NativeWrapper/Microsoft.DotNet.NativeWrapper.csproj b/src/Resolvers/Microsoft.DotNet.NativeWrapper/Microsoft.DotNet.NativeWrapper.csproj +index a97b55bb23..cb2affc131 100644 +--- a/src/Resolvers/Microsoft.DotNet.NativeWrapper/Microsoft.DotNet.NativeWrapper.csproj ++++ b/src/Resolvers/Microsoft.DotNet.NativeWrapper/Microsoft.DotNet.NativeWrapper.csproj +@@ -10,6 +10,6 @@ + + + +- ++ + + +-- +2.29.2 + diff --git a/src/SourceBuild/tarball/content/patches/sdk/0002-NoWarn-NU1605-until-DeploymentTools-is-in-SourceBuil.patch b/src/SourceBuild/tarball/patches/sdk/0002-NoWarn-NU1605-until-DeploymentTools-is-in-SourceBuil.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/sdk/0002-NoWarn-NU1605-until-DeploymentTools-is-in-SourceBuil.patch rename to src/SourceBuild/tarball/patches/sdk/0002-NoWarn-NU1605-until-DeploymentTools-is-in-SourceBuil.patch diff --git a/src/SourceBuild/tarball/content/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch b/src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch rename to src/SourceBuild/tarball/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch diff --git a/src/SourceBuild/tarball/content/patches/deployment-tools/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch b/src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/deployment-tools/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch rename to src/SourceBuild/tarball/patches/sourcelink/0002-https-github.com-dotnet-arcade-issues-7778-Ignore-cu.patch diff --git a/src/SourceBuild/tarball/content/patches/templating/0001-pin-nuget-versions.patch b/src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/templating/0001-pin-nuget-versions.patch rename to src/SourceBuild/tarball/patches/templating/0001-pin-nuget-versions.patch diff --git a/src/SourceBuild/tarball/content/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch b/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch rename to src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch diff --git a/src/SourceBuild/tarball/content/patches/vstest/0002-Exclude-externals-when-building-from-source.patch b/src/SourceBuild/tarball/patches/vstest/0002-Exclude-externals-when-building-from-source.patch similarity index 100% rename from src/SourceBuild/tarball/content/patches/vstest/0002-Exclude-externals-when-building-from-source.patch rename to src/SourceBuild/tarball/patches/vstest/0002-Exclude-externals-when-building-from-source.patch diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index 1f378f56b..ad9af2548 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 70f4e921a..91f6e2326 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,6 +1,7 @@ + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 7892cc38b..f9593bbea 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -26,8 +26,8 @@ 30 - 19 - 10 + 20 + 11 @@ -105,6 +105,7 @@ @@ -185,7 +187,7 @@ - + diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 26ada8fd0..66da486ca 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -466,6 +466,13 @@ Overwrite="true" /> + + + + + @@ -535,6 +542,7 @@ LayoutRuntimeGraph; LayoutTemplates; LayoutManifests; + LayoutWorkloadUserLocalMarker; LayoutBundledTools; RetargetTools; CrossgenLayout; diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index c5eb59fcd..7ea8792fb 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -13,8 +13,8 @@ - 3.14.0.4118 - https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip + 1.0.0-v3.14.0.4118 + https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip $(WixRoot)/WixDownload.$(WixVersion).sentinel @@ -180,6 +180,7 @@ + + @@ -306,6 +308,7 @@ + diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets index 700ee7ab7..39a79152d 100644 --- a/src/redist/targets/GeneratePKG.targets +++ b/src/redist/targets/GeneratePKG.targets @@ -14,6 +14,7 @@ com.microsoft.dotnet.dev.$(Version).osx.$(Architecture) /usr/local/share/dotnet + /usr/local/share/dotnet/x64 $(MSBuildThisFileDirectory)packaging/osx/clisdk $(SdkPkgSourcesRootDirectory)/scripts @@ -22,7 +23,8 @@ $(SdkPkgDestinationScriptsDirectory)/postinstall $(PkgIntermediateDirectory)/resources - $(SdkPkgSourcesRootDirectory)/Distribution-Template + $(SdkPkgSourcesRootDirectory)/Distribution-Template + $(SdkPkgSourcesRootDirectory)/Distribution-Template-x64 $(PkgIntermediateDirectory)/CLI-SDK-Formatted-Distribution-Template.xml $(PkgIntermediateDirectory)/$(SdkComponentId).pkg @@ -96,6 +98,9 @@ 10.13 11.0 + + $(x64EmulationPkgInstallDirectory) + $(Version) diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index ccbd0a79f..935684431 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -180,6 +180,12 @@ SkipUnchangedFiles="False" UseHardlinksIfPossible="False"/> + + $(RedistLayoutPath)templates/ $(ArtifactsShippingPackagesDir)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(SdkRPMInstallerFile) + $(ArtifactsShippingPackagesDir)$(MarinerArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) $(RepoRoot)/Documentation/manpages $(RepoRoot)/test/EndToEnd/EndToEnd.csproj diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 549b8e48b..5133c3a38 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -38,6 +38,7 @@ Changing "ProductBandCombinedHostHostFxrFrameworkSdkName" mid-product-band will break the upgradability of the SDK bundle installer. --> Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(Architecture) + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-cm.1-$(Architecture) diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 new file mode 100644 index 000000000..cbd637311 --- /dev/null +++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template-x64 @@ -0,0 +1,101 @@ + + + {CLISdkBrandName} ({arch}) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {NetCoreAppTargetingPackComponentId}.pkg + {NetStandardTargetingPackComponentId}.pkg + {NetCoreAppHostPackComponentId}.pkg + {SharedFxComponentId}.pkg + {HostFxrComponentId}.pkg + {SharedHostComponentId}.pkg + {CLISdkComponentId}.pkg + + diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index 7063e6c64..40b118b73 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -11,11 +11,16 @@ Compressed="yes"> - WixBundleInstalled OR ((NOT (DOTNETHOME_X64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE) + WixBundleInstalled OR (NOT DOTNETHOME_X64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE - WixBundleInstalled OR ((NOT (DOTNETHOME_ARM64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE) + WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE + + + + + WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X64) OR (NOT NativeProcessorArchitecture="ARM64") OR DOTNETHOMESIMILARITYCHECKOVERRIDE @@ -27,7 +32,7 @@ - + - + - - + + + + - + + + + + - - - + + + diff --git a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs index 211883bb3..902a2505f 100644 --- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs +++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs @@ -30,12 +30,6 @@ - - - - - - + + + + diff --git a/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs b/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs new file mode 100644 index 000000000..5e30f9871 --- /dev/null +++ b/src/redist/targets/packaging/windows/clisdk/dotnethome_x64.wxs @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + ? + + + + + + NOT %PROCESSOR_ARCHITECTURE="$(var.InstallerArchitecture)" + + + + + + + + NON_NATIVE_ARCHITECTURE AND NOT DOTNETHOME + + + + \ No newline at end of file diff --git a/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1 index 4ef97e1dc..bef841dc2 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatemanifestsmsi.ps1 @@ -65,6 +65,7 @@ function RunCandle -ext WixDependencyExtension.dll ` "$PSScriptRoot\manifests.wxs" ` "$PSScriptRoot\provider.wxs" ` + "$PSScriptRoot\dotnethome_x64.wxs" ` $InstallFileswsx Write-Information "Candle output: $candleOutput" @@ -91,6 +92,7 @@ function RunLight -cultures:en-us ` manifests.wixobj ` provider.wixobj ` + dotnethome_x64.wixobj ` $InstallFilesWixobj ` -b "$inputDir" ` -b "$PSScriptRoot" ` diff --git a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 index 47d83909c..13b4e9636 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 @@ -73,6 +73,7 @@ function RunCandle -arch "$Architecture" ` -ext WixDependencyExtension.dll ` "$PSScriptRoot\dotnet.wxs" ` + "$PSScriptRoot\dotnethome_x64.wxs" ` "$PSScriptRoot\provider.wxs" ` "$PSScriptRoot\registrykeys.wxs" ` $InstallFileswsx @@ -100,6 +101,7 @@ function RunLight $lightOutput = .\light.exe -nologo -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension ` -cultures:en-us ` dotnet.wixobj ` + dotnethome_x64.wixobj ` provider.wixobj ` registrykeys.wixobj ` $InstallFilesWixobj ` diff --git a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 index 151767c7e..ecbb68ba6 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1 @@ -63,6 +63,7 @@ function RunCandle -dDependencyKeyName="$DependencyKeyName" ` -arch "$Architecture" ` -ext WixDependencyExtension.dll ` + "$PSScriptRoot\dotnethome_x64.wxs" ` "$PSScriptRoot\templates.wxs" ` "$PSScriptRoot\provider.wxs" ` $InstallFileswsx @@ -89,6 +90,7 @@ function RunLight $lightOutput = .\light.exe -nologo -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension ` -cultures:en-us ` + dotnethome_x64.wixobj ` templates.wixobj ` provider.wixobj ` $InstallFilesWixobj ` diff --git a/src/redist/targets/packaging/windows/clisdk/manifests.wxs b/src/redist/targets/packaging/windows/clisdk/manifests.wxs index a2ef49c4b..27a3017d0 100644 --- a/src/redist/targets/packaging/windows/clisdk/manifests.wxs +++ b/src/redist/targets/packaging/windows/clisdk/manifests.wxs @@ -32,5 +32,9 @@ + + + + diff --git a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs index f47cfca05..c6f44ccc3 100644 --- a/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs +++ b/src/redist/targets/packaging/windows/clisdk/registrykeys.wxs @@ -16,5 +16,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NOT DOTNETHOME_X86 AND DOTNETHOME_X86_SEARCH + + + NOT DOTNETHOME_X64 AND DOTNETHOME_X64_SEARCH AND %PROCESSOR_ARCHITECTURE="AMD64" + + + NOT DOTNETHOME_X64 AND DOTNETHOME_X64_ALT_SEARCH AND NOT %PROCESSOR_ARCHITECTURE="AMD64" + + + NOT DOTNETHOME_ARM64 AND DOTNETHOME_ARM64_SEARCH + + diff --git a/src/redist/targets/packaging/windows/clisdk/templates.wxs b/src/redist/targets/packaging/windows/clisdk/templates.wxs index a2ef49c4b..27a3017d0 100644 --- a/src/redist/targets/packaging/windows/clisdk/templates.wxs +++ b/src/redist/targets/packaging/windows/clisdk/templates.wxs @@ -32,5 +32,9 @@ + + + + diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index fad27e88f..4a9f97435 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -102,7 +102,7 @@ namespace EndToEnd.Tests .WithWorkingDirectory(projectDirectory) .Execute(publishArgs) .Should().Pass(); - + var selfContainedPublishDir = new DirectoryInfo(projectDirectory) .Sub("bin").Sub("Debug").GetDirectories().FirstOrDefault() .Sub("win-arm64").Sub("publish"); @@ -110,7 +110,7 @@ namespace EndToEnd.Tests selfContainedPublishDir.Should().HaveFilesMatching("System.Windows.Forms.dll", SearchOption.TopDirectoryOnly); selfContainedPublishDir.Should().HaveFilesMatching($"{directory.Name}.dll", SearchOption.TopDirectoryOnly); } - + [WindowsOnlyFact] public void ItCanPublishArm64Wpf() { @@ -165,7 +165,7 @@ namespace EndToEnd.Tests public void DotnetNewShowsCuratedListCorrectly() { string locale = System.Threading.Thread.CurrentThread.CurrentUICulture.Name; - if (!string.IsNullOrWhiteSpace(locale) + if (!string.IsNullOrWhiteSpace(locale) && !locale.StartsWith("en", StringComparison.OrdinalIgnoreCase)) { Console.WriteLine($"[{nameof(DotnetNewShowsCuratedListCorrectly)}] CurrentUICulture: {locale}"); @@ -247,7 +247,7 @@ namespace EndToEnd.Tests /// /// The test checks if the template creates the template for correct framework by default. - /// For .NET 6 the templates should create the projects targeting net6.0 + /// For .NET 6 the templates should create the projects targeting net6.0 /// [Theory] [InlineData("console")] diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 7f25ca27a..30ef0caae 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -145,5 +145,174 @@ Skip="true" Issue="" Reason="https://github.com/dotnet/installer/pull/8966#issuecomment-721111308"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +