diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8ffe0727..c78ca1cf1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,41 +5,41 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 6153872f19b1cd05b26c92d8080e56c1892ba55c + c805f1d0fd42909046af661edb02bcf1428ff304 - + https://github.com/dotnet/windowsdesktop - 6153872f19b1cd05b26c92d8080e56c1892ba55c + c805f1d0fd42909046af661edb02bcf1428ff304 - + https://github.com/dotnet/windowsdesktop - 6153872f19b1cd05b26c92d8080e56c1892ba55c + c805f1d0fd42909046af661edb02bcf1428ff304 - + https://github.com/dotnet/windowsdesktop - 6153872f19b1cd05b26c92d8080e56c1892ba55c + c805f1d0fd42909046af661edb02bcf1428ff304 - + https://github.com/dotnet/runtime - d8c3db7d096da710a3f667d70c36e34c1bf63921 + c46410f099b6358461d2de89f81393c91d2b40f7 - + https://github.com/dotnet/runtime - d8c3db7d096da710a3f667d70c36e34c1bf63921 + c46410f099b6358461d2de89f81393c91d2b40f7 - + https://github.com/dotnet/runtime - d8c3db7d096da710a3f667d70c36e34c1bf63921 + c46410f099b6358461d2de89f81393c91d2b40f7 - + https://github.com/dotnet/runtime - d8c3db7d096da710a3f667d70c36e34c1bf63921 + c46410f099b6358461d2de89f81393c91d2b40f7 - + https://github.com/dotnet/runtime - d8c3db7d096da710a3f667d70c36e34c1bf63921 + c46410f099b6358461d2de89f81393c91d2b40f7 @@ -47,70 +47,70 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - d8c3db7d096da710a3f667d70c36e34c1bf63921 + c46410f099b6358461d2de89f81393c91d2b40f7 - + https://github.com/dotnet/runtime - d8c3db7d096da710a3f667d70c36e34c1bf63921 + c46410f099b6358461d2de89f81393c91d2b40f7 - + https://github.com/dotnet/aspnetcore - 3f99d45b0b7d8f0427a3d98acc63098694613362 + 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 - + https://github.com/dotnet/aspnetcore - 3f99d45b0b7d8f0427a3d98acc63098694613362 + 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 - + https://github.com/dotnet/aspnetcore - 3f99d45b0b7d8f0427a3d98acc63098694613362 + 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 - + https://github.com/dotnet/aspnetcore - 3f99d45b0b7d8f0427a3d98acc63098694613362 + 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 - + https://github.com/dotnet/aspnetcore - 3f99d45b0b7d8f0427a3d98acc63098694613362 + 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 - + https://github.com/dotnet/aspnetcore - 3f99d45b0b7d8f0427a3d98acc63098694613362 + 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 - + https://github.com/dotnet/aspnetcore - 3f99d45b0b7d8f0427a3d98acc63098694613362 + 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 - + https://github.com/dotnet/aspnetcore - 3f99d45b0b7d8f0427a3d98acc63098694613362 + 63c8031b6a6af5009b3c5bb4291fcc4c32b06b10 - + https://github.com/dotnet/sdk - 219a6fc9954d632d7c119b31d59ff1516ff04d98 + 1d212f88bd92e3257fea744aba7199f872ee4989 - + https://github.com/dotnet/sdk - 219a6fc9954d632d7c119b31d59ff1516ff04d98 + 1d212f88bd92e3257fea744aba7199f872ee4989 - + https://github.com/dotnet/sdk - 219a6fc9954d632d7c119b31d59ff1516ff04d98 + 1d212f88bd92e3257fea744aba7199f872ee4989 - + https://github.com/dotnet/sdk - 219a6fc9954d632d7c119b31d59ff1516ff04d98 + 1d212f88bd92e3257fea744aba7199f872ee4989 - + https://github.com/dotnet/sdk - 219a6fc9954d632d7c119b31d59ff1516ff04d98 + 1d212f88bd92e3257fea744aba7199f872ee4989 @@ -152,14 +152,14 @@ https://github.com/dotnet/wpf 6ffdf5ca7bdc28496c8b5533277705fba66483f4 - + https://github.com/dotnet/fsharp - 8d852e43d35fdac96b1ba52e3bd4b35350035914 + 4a394198efadc455334ae272954ece372aea4de2 - + https://github.com/dotnet/fsharp - 8d852e43d35fdac96b1ba52e3bd4b35350035914 + 4a394198efadc455334ae272954ece372aea4de2 @@ -172,63 +172,63 @@ 6957756d70d6ade74e239a38ad709db5cb39fe0d - + https://github.com/dotnet/runtime - d8c3db7d096da710a3f667d70c36e34c1bf63921 + c46410f099b6358461d2de89f81393c91d2b40f7 - + https://github.com/dotnet/roslyn - b2a0a985202805db6160e6c070ac828e9e3a8094 + 919d4dbfb0dffb35a702417e28ceea652d248bc6 - + https://github.com/dotnet/roslyn - b2a0a985202805db6160e6c070ac828e9e3a8094 + 919d4dbfb0dffb35a702417e28ceea652d248bc6 - + https://github.com/dotnet/msbuild - de776177f6d540e656e6b0c6d5bb07f2ff518c19 + bf82a1313390df2692c23206e0846b205398188b - + https://github.com/dotnet/msbuild - de776177f6d540e656e6b0c6d5bb07f2ff518c19 + bf82a1313390df2692c23206e0846b205398188b - + https://github.com/nuget/nuget.client - 1845d6bd450a7453d573035371c9fec43683d1ef + fb50d1a45ed10b39b5f335bc3a4bdcaea9b951cf https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 5dd0620274178dd73cac5049e5187c00e07ecf0c + e4c6eabba09c9d8c4d1bfb40511cb9d494fb0626 - + https://github.com/dotnet/emsdk - 5dd0620274178dd73cac5049e5187c00e07ecf0c + e4c6eabba09c9d8c4d1bfb40511cb9d494fb0626 - + https://github.com/dotnet/deployment-tools - 2a7741c5a7cb49fbad797c4b2f7812d5620430ac + 596a11e185d2274531fe57a2c9e03bbe4f23064d - + https://github.com/dotnet/deployment-tools - 2a7741c5a7cb49fbad797c4b2f7812d5620430ac + 596a11e185d2274531fe57a2c9e03bbe4f23064d - + https://github.com/dotnet/source-build-externals - b46b7e6859f4094cd7f3e00dc0471d62f5d8d051 + 52d6569d44f86b5d442017f4a9eb3cda4c766afb @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services 0e9abfee048404d9b994fc64235b42216ce68dad - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 - + https://github.com/dotnet/arcade - c936d1bc358744730613d8ce54bc3e0294e5ea56 + b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 @@ -282,14 +282,14 @@ c0b5d69a1a1513528c77fffff708c7502d57c35c - + https://github.com/dotnet/scenario-tests - bfde902a10d7b672f4fc7e844198ede405dbb9c6 + ddccfec3ccd631fb8341c8b6e4e422e8cb339aa5 - + https://github.com/dotnet/scenario-tests - bfde902a10d7b672f4fc7e844198ede405dbb9c6 + ddccfec3ccd631fb8341c8b6e4e422e8cb339aa5 - 9.0.0-beta.24172.4 + 9.0.0-beta.24176.6 @@ -67,49 +67,49 @@ - 9.0.0-preview.4.24173.3 - 9.0.0-preview.4.24173.3 - 9.0.0-preview.4.24173.3 - 9.0.0-preview.4.24173.3 - 9.0.0-preview.4.24173.3 - 9.0.0-preview.4.24173.3 - 9.0.0-preview.4.24173.3 + 9.0.0-preview.4.24176.7 + 9.0.0-preview.4.24176.7 + 9.0.0-preview.4.24176.7 + 9.0.0-preview.4.24176.7 + 9.0.0-preview.4.24176.7 + 9.0.0-preview.4.24176.7 + 9.0.0-preview.4.24176.7 0.2.0 - 9.0.100-preview.4.24175.4 - 9.0.100-preview.4.24175.4 - 9.0.100-preview.4.24175.4 + 9.0.100-preview.4.24177.2 + 9.0.100-preview.4.24177.2 + 9.0.100-preview.4.24177.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24169.3 + 4.10.0-3.24175.2 - 9.0.0-preview.4.24174.6 + 9.0.0-preview.4.24176.12 - 9.0.0-preview.4.24174.6 - 9.0.0-preview.4.24174.6 - 9.0.0-preview.4.24174.6 - 9.0.0-preview.4.24174.6 - 9.0.0-preview.4.24174.6 + 9.0.0-preview.4.24176.12 + 9.0.0-preview.4.24176.12 + 9.0.0-preview.4.24176.12 + 9.0.0-preview.4.24176.12 + 9.0.0-preview.4.24176.12 2.1.0 - 9.0.0-preview.4.24173.1 - 9.0.0-preview.4.24173.1 - 9.0.0-preview.4.24173.1 - 9.0.0-preview.4.24173.1 + 9.0.0-preview.4.24176.1 + 9.0.0-preview.4.24176.1 + 9.0.0-preview.4.24176.1 + 9.0.0-preview.4.24176.1 @@ -121,11 +121,11 @@ - 6.10.0-preview.2.81 + 6.10.0-preview.2.97 - 2.0.0-preview.1.24168.2 + 2.0.0-preview.1.24172.2 @@ -212,7 +212,7 @@ 2.0.0 17.10.0-preview-24170-01 9.0.0-alpha.1.24058.10 - 9.0.0-preview.24057.2 + 9.0.0-preview.24176.1 @@ -226,7 +226,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.3.24160.1 + 9.0.0-preview.4.24176.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh index 5dcbfd700..228be0b15 100644 --- a/eng/common/native/init-distro-rid.sh +++ b/eng/common/native/init-distro-rid.sh @@ -20,7 +20,7 @@ getNonPortableDistroRid() # shellcheck disable=SC1091 if [ -e "${rootfsDir}/etc/os-release" ]; then . "${rootfsDir}/etc/os-release" - if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then + if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ] || [ "${ID}" = "ol" ]; then VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros fi diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 16727e258..c63e17e86 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -136,6 +136,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index b59f2e9c5..1af3d63d7 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -136,16 +136,10 @@ jobs: artifactName: $(Agent.JobName)_BuildLogs_Attempt$(System.JobAttempt) - output: pipelineArtifact + path: $(Build.ArtifactStagingDirectory)/publishing + artifact: $(Agent.JobName)_Artifacts displayName: Publish Artifacts - condition: and(succeededOrFailed(), eq(variables['hasAssets'], 'true')) - targetPath: $(sourcesPath)/artifacts/assets/Release/ - artifactName: $(Agent.JobName)_Artifacts - - - ${{ if ne(parameters.buildSourceOnly, 'true') }}: - - output: pipelineArtifact - displayName: Publish Packages - targetPath: $(sourcesPath)/artifacts/packages/Release/ - artifactName: $(Agent.JobName)_Packages + condition: always() - ${{ if not(parameters.isBuiltFromVmr) }}: - output: pipelineArtifact @@ -327,6 +321,8 @@ jobs: # Allows Arcade to have access to the commit for the build, pass it through to the container customEnvVars="$customEnvVars BUILD_SOURCEVERSION=$BUILD_SOURCEVERSION" + customEnvVars="$customEnvVars BUILD_BUILDNUMBER=$(Build.BuildNumber)" + customDockerRunArgs="" for envVar in $customEnvVars; do customDockerRunArgs="$customDockerRunArgs -e $envVar" @@ -458,7 +454,3 @@ jobs: SourceFolder: $(sourcesPath)/artifacts/packages TargetFolder: $(Build.ArtifactStagingDirectory)/publishing/packages displayName: Copy packages to Artifact Staging Directory - - - publish: $(Build.ArtifactStagingDirectory)/publishing - artifact: $(Agent.JobName)_Artifacts - displayName: Publish Artifacts diff --git a/global.json b/global.json index 93f2b53e5..fd277162f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24172.4", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24172.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24176.6", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24176.6" } } diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index ebfb4cfde..44fbdcb06 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -203,9 +203,8 @@ - $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.DotNet.SourceBuild.Tasks.XPlat', '$(Configuration)', 'Microsoft.DotNet.SourceBuild.Tasks.XPlat.dll')) - $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.DotNet.SourceBuild.Tasks.LeakDetection', '$(Configuration)', 'Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.dll')) - $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.DotNet.SourceBuild.Tasks.MergeAssetManifests', '$(Configuration)', 'Microsoft.DotNet.SourceBuild.Tasks.MergeAssetManifests.dll')) + $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.DotNet.UnifiedBuild.Tasks', '$(Configuration)', 'Microsoft.DotNet.UnifiedBuild.Tasks.dll')) + $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.DotNet.SourceBuild.Tasks.LeakDetection', '$(Configuration)', 'Microsoft.DotNet.SourceBuild.Tasks.LeakDetection.dll')) @@ -214,12 +213,6 @@ $(PackageReportDir)poisoned.txt - - - $(BUILD_BUILDNUMBER)" - - diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj index 0f3b6948c..c6d8d325b 100644 --- a/src/SourceBuild/content/build.proj +++ b/src/SourceBuild/content/build.proj @@ -9,8 +9,6 @@ - - source-build @@ -27,6 +25,8 @@ StopOnFirstFailure="true" /> + + $(ArtifactsDir)VerticalManifest.xml @@ -36,10 +36,11 @@ - + + VmrBuildNumber="$(BUILD_BUILDNUMBER)" /> diff --git a/src/SourceBuild/content/eng/build.sourcebuild.targets b/src/SourceBuild/content/eng/build.sourcebuild.targets index daaadbc72..557e4c78d 100644 --- a/src/SourceBuild/content/eng/build.sourcebuild.targets +++ b/src/SourceBuild/content/eng/build.sourcebuild.targets @@ -31,7 +31,7 @@ - + @@ -71,7 +71,7 @@ Targets="ReportPrebuiltUsage" /> - + - + diff --git a/src/SourceBuild/content/eng/tools/init-build.proj b/src/SourceBuild/content/eng/tools/init-build.proj index 13e30ae89..fc82ffa5d 100644 --- a/src/SourceBuild/content/eng/tools/init-build.proj +++ b/src/SourceBuild/content/eng/tools/init-build.proj @@ -13,11 +13,10 @@ @@ -64,11 +63,11 @@ DependsOnTargets="UnpackTarballs" Inputs="$(MSBuildProjectFullPath)" Outputs="$(BaseIntermediateOutputPath)BuildMSBuildSdkResolver.complete"> - - @@ -77,24 +76,20 @@ - - $([MSBuild]::NormalizePath('$(VSMSBuildSdkResolversDir)', 'SourceBuild.MSBuildSdkResolver', 'SourceBuild.MSBuildSdkResolver.xml')) - - - - + - - + @@ -128,24 +123,6 @@ Properties="ExcludeFromDotNetBuild=false" /> - - - - - - - - - - - - @@ -169,18 +146,13 @@ DestinationFolder="$(ArcadeBootstrapPackageDir)microsoft.dotnet.arcade.sdk/$(ARCADE_BOOTSTRAP_VERSION)/" SkipUnchangedFiles="true" /> - - - - + - + diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.MergeAssetManifests/Microsoft.DotNet.SourceBuild.Tasks.MergeAssetManifests.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.MergeAssetManifests/Microsoft.DotNet.SourceBuild.Tasks.MergeAssetManifests.csproj deleted file mode 100644 index 25d4fd1b9..000000000 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.MergeAssetManifests/Microsoft.DotNet.SourceBuild.Tasks.MergeAssetManifests.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - $(NetCurrent) - enable - - - - - - - - - - - diff --git a/src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.MSBuildSdkResolver/Microsoft.DotNet.UnifiedBuild.MSBuildSdkResolver.csproj similarity index 59% rename from src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.MSBuildSdkResolver/Microsoft.DotNet.UnifiedBuild.MSBuildSdkResolver.csproj index 6cae18884..212ab9967 100644 --- a/src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuild.MSBuildSdkResolver.csproj +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.MSBuildSdkResolver/Microsoft.DotNet.UnifiedBuild.MSBuildSdkResolver.csproj @@ -5,19 +5,17 @@ - - - $([MSBuild]::NormalizePath('$(VSMSBuildSdkResolversDir)', '$(MSBuildProjectName)', '$(MSBuildProjectName).xml')) + $([MSBuild]::NormalizePath('$(VSMSBuildSdkResolversDir)', '$(MSBuildProjectName)', '$(MSBuildProjectName).xml')) diff --git a/src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.MSBuildSdkResolver/UnifiedBuildSdkResolver.cs similarity index 97% rename from src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.MSBuildSdkResolver/UnifiedBuildSdkResolver.cs index b4a52c96d..21f38937a 100644 --- a/src/SourceBuild/content/eng/tools/tasks/SourceBuild.MSBuildSdkResolver/SourceBuiltSdkResolver.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.MSBuildSdkResolver/UnifiedBuildSdkResolver.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace Microsoft.DotNet.SourceBuild.Tasks +namespace Microsoft.DotNet.UnifiedBuild.Tasks { /// /// Extends the SDK to handle "SOURCE_BUILT_SDK_*" override environment variables. Each override @@ -25,9 +25,9 @@ namespace Microsoft.DotNet.SourceBuild.Tasks /// SOURCE_BUILT_SDK_VERSION_EXAMPLE=1.0.0-source-built /// (Optional) Version of the SDK package to use. This is informational. /// - public class SourceBuiltSdkResolver : SdkResolver + public class UnifiedBuildSdkResolver : SdkResolver { - public override string Name => nameof(SourceBuiltSdkResolver); + public override string Name => nameof(UnifiedBuildSdkResolver); public override int Priority => 0; diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/AddSourceToNuGetConfig.cs similarity index 98% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/AddSourceToNuGetConfig.cs index 1d6458678..3b62bbe5f 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/AddSourceToNuGetConfig.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/AddSourceToNuGetConfig.cs @@ -10,8 +10,7 @@ using System.Xml.Linq; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; - -namespace Microsoft.DotNet.Build.Tasks +namespace Microsoft.DotNet.UnifiedBuild.Tasks { /* * This task adds a source to a well-formed NuGet.Config file. If a source with `SourceName` is already present, then diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/BuildTask.cs similarity index 94% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/BuildTask.cs index f4fd687e9..e8155b072 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/BuildTask.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/BuildTask.cs @@ -5,7 +5,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.DotNet.Build.Tasks +namespace Microsoft.DotNet.UnifiedBuild.Tasks { public abstract partial class BuildTask : ITask { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/CreateSdkSymbolsLayout.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/CreateSdkSymbolsLayout.cs similarity index 99% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/CreateSdkSymbolsLayout.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/CreateSdkSymbolsLayout.cs index 7e00bbf30..1887b8fb5 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/CreateSdkSymbolsLayout.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/CreateSdkSymbolsLayout.cs @@ -12,7 +12,7 @@ using System.Reflection.PortableExecutable; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.DotNet.Build.Tasks +namespace Microsoft.DotNet.UnifiedBuild.Tasks { // Creates a symbols layout that matches the SDK layout public class CreateSdkSymbolsLayout : Task diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/EnumerableExtensions.cs similarity index 91% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/EnumerableExtensions.cs index 74102cff0..53efc7190 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/EnumerableExtensions.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/EnumerableExtensions.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.DotNet.SourceBuild.Tasks +namespace Microsoft.DotNet.UnifiedBuild.Tasks { internal static class EnumerableExtensions { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/FileUtilities.cs similarity index 97% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/FileUtilities.cs index c249f5435..6d534b935 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/FileUtilities.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/FileUtilities.cs @@ -4,7 +4,7 @@ using System; -namespace Microsoft.DotNet.Build.Tasks +namespace Microsoft.DotNet.UnifiedBuild.Tasks { public static class FileUtilities { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/Log.cs similarity index 98% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/Log.cs index 83d587c0a..67b7bae56 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Log.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/Log.cs @@ -5,7 +5,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.DotNet.Build.Tasks.Packaging +namespace Microsoft.DotNet.UnifiedBuild.Tasks { internal class Log : ILog { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.MergeAssetManifests/MergeAssetManifests.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/MergeAssetManifests.cs similarity index 97% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.MergeAssetManifests/MergeAssetManifests.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/MergeAssetManifests.cs index 8695fa3ca..4ee3fed5e 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.MergeAssetManifests/MergeAssetManifests.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/MergeAssetManifests.cs @@ -2,6 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +#nullable enable + using Microsoft.Build.Utilities; using Microsoft.Build.Framework; using System; @@ -10,7 +12,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -namespace Microsoft.DotNet.SourceBuild.Tasks +namespace Microsoft.DotNet.UnifiedBuild.Tasks { public class MergeAssetManifests : Task { @@ -29,8 +31,7 @@ namespace Microsoft.DotNet.SourceBuild.Tasks /// /// Azure DevOps build number /// - [Required] - public required string VmrBuildNumber { get; init; } + public string VmrBuildNumber { get; set; } = string.Empty; private static readonly string _buildIdAttribute = "BuildId"; private static readonly string _azureDevOpsBuildNumberAttribute = "AzureDevOpsBuildNumber"; diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/Microsoft.DotNet.UnifiedBuild.Tasks.csproj similarity index 70% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/Microsoft.DotNet.UnifiedBuild.Tasks.csproj index d3a161702..548667800 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/Microsoft.DotNet.UnifiedBuild.Tasks.csproj @@ -5,8 +5,6 @@ - - diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/Models/VersionDetailsXml.cs similarity index 95% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/Models/VersionDetailsXml.cs index 89e78085e..538340ec4 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Models/VersionDetailsXml.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/Models/VersionDetailsXml.cs @@ -4,7 +4,7 @@ using System.Xml.Serialization; -namespace Microsoft.DotNet.SourceBuild.Tasks.Models +namespace Microsoft.DotNet.UnifiedBuild.Tasks.Models { [XmlRoot("Dependencies")] public class VersionDetails diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/ReadNuGetPackageInfos.cs similarity index 97% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/ReadNuGetPackageInfos.cs index 43a04ebd0..59ce680e4 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/ReadNuGetPackageInfos.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/ReadNuGetPackageInfos.cs @@ -9,7 +9,7 @@ using NuGet.Packaging.Core; using System.Collections.Generic; using System.Linq; -namespace Microsoft.DotNet.SourceBuild.Tasks +namespace Microsoft.DotNet.UnifiedBuild.Tasks { public class ReadNuGetPackageInfos : Task { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/RemoveInternetSourcesFromNuGetConfig.cs similarity index 98% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/RemoveInternetSourcesFromNuGetConfig.cs index 0a0206bef..ee379657f 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/RemoveInternetSourcesFromNuGetConfig.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/RemoveInternetSourcesFromNuGetConfig.cs @@ -11,7 +11,7 @@ using System.Xml.Linq; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.DotNet.Build.Tasks +namespace Microsoft.DotNet.UnifiedBuild.Tasks { /* * This task removes internet sources from a given NuGet.config. In the offline build mode, it removes all diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateJson.cs similarity index 98% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateJson.cs index b79e1783e..cffab0b2b 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateJson.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateJson.cs @@ -10,7 +10,7 @@ using Newtonsoft.Json.Linq; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.DotNet.Build.Tasks +namespace Microsoft.DotNet.UnifiedBuild.Tasks { // Takes a path to a path to a json file and a // string that represents a dotted path to an attribute diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs similarity index 99% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs index e8c37abf8..05d1439a9 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UpdateNuGetConfigPackageSourcesMappings.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs @@ -14,7 +14,7 @@ using System.Xml.Linq; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.DotNet.Build.Tasks +namespace Microsoft.DotNet.UnifiedBuild.Tasks { /* * This task updates the package source mappings in the NuGet.Config using the following logic: diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/AnnotatedUsage.cs similarity index 96% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/AnnotatedUsage.cs index e15a032f6..896be816c 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/AnnotatedUsage.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/AnnotatedUsage.cs @@ -4,7 +4,7 @@ using System.Xml.Linq; -namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport +namespace Microsoft.DotNet.UnifiedBuild.Tasks.UsageReport { public class AnnotatedUsage { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/Usage.cs similarity index 98% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/Usage.cs index 8b35947db..b8817f2c2 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/Usage.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/Usage.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Linq; using System.Xml.Linq; -namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport +namespace Microsoft.DotNet.UnifiedBuild.Tasks.UsageReport { public class Usage : IEquatable { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/UsageData.cs similarity index 97% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/UsageData.cs index ce6c836c4..4a2fc9ed9 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/UsageData.cs @@ -6,7 +6,7 @@ using NuGet.Packaging.Core; using System.Linq; using System.Xml.Linq; -namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport +namespace Microsoft.DotNet.UnifiedBuild.Tasks.UsageReport { public class UsageData { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/ValidateUsageAgainstBaseline.cs similarity index 98% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/ValidateUsageAgainstBaseline.cs index 6c80f2756..834e8b556 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/ValidateUsageAgainstBaseline.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/ValidateUsageAgainstBaseline.cs @@ -10,7 +10,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport +namespace Microsoft.DotNet.UnifiedBuild.Tasks.UsageReport { public class ValidateUsageAgainstBaseline : Task { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/WritePackageUsageData.cs similarity index 99% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/WritePackageUsageData.cs index 73c7026a5..073c92644 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WritePackageUsageData.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/WritePackageUsageData.cs @@ -16,7 +16,7 @@ using System.Linq; using System.Threading.Tasks; using Task = Microsoft.Build.Utilities.Task; -namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport +namespace Microsoft.DotNet.UnifiedBuild.Tasks.UsageReport { public class WritePackageUsageData : Task { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/WriteUsageBurndownData.cs similarity index 98% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/WriteUsageBurndownData.cs index 2a6d00863..f99c8463d 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageBurndownData.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/WriteUsageBurndownData.cs @@ -20,7 +20,7 @@ using System.Threading.Tasks; using System.Xml.Linq; using Task = Microsoft.Build.Utilities.Task; -namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport +namespace Microsoft.DotNet.UnifiedBuild.Tasks.UsageReport { public class WriteUsageBurndownData : Task { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/WriteUsageReports.cs similarity index 99% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/WriteUsageReports.cs index 73cbdec66..b22f5dac3 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/WriteUsageReports.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/WriteUsageReports.cs @@ -4,7 +4,6 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using Microsoft.DotNet.Build.Tasks; using System; using System.Collections.Generic; using System.IO; @@ -12,7 +11,7 @@ using System.Linq; using System.Text; using System.Xml.Linq; -namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport +namespace Microsoft.DotNet.UnifiedBuild.Tasks.UsageReport { public class WriteUsageReports : Task { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/XmlParsingHelpers.cs similarity index 96% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/XmlParsingHelpers.cs index c30173fff..c252e8def 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/XmlParsingHelpers.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UsageReport/XmlParsingHelpers.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Linq; using System.Xml.Linq; -namespace Microsoft.DotNet.SourceBuild.Tasks.UsageReport +namespace Microsoft.DotNet.UnifiedBuild.Tasks.UsageReport { internal static class XmlParsingHelpers { diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WritePackageVersionProps.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/WritePackageVersionsProps.cs similarity index 99% rename from src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WritePackageVersionProps.cs rename to src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/WritePackageVersionsProps.cs index 618dd0dd5..4f0ad4cd1 100644 --- a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/WritePackageVersionProps.cs +++ b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/WritePackageVersionsProps.cs @@ -15,7 +15,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Xml; -namespace Microsoft.DotNet.Build.Tasks +namespace Microsoft.DotNet.UnifiedBuild.Tasks { public class VersionEntry { diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 70ed6e4fa..b54a33934 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -30,15 +30,6 @@ $(IntermediateSymbolsRootDir)$(RepositoryName) - - - - - - - - - @@ -105,6 +96,9 @@ + + + + + - - - @@ -647,6 +637,7 @@ ExtractSymbolsArchiveFile; CleanupRepo" /> + @@ -721,6 +712,8 @@ + + diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index 5de0177d4..bf77ef870 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -4,8 +4,11 @@ $(ProjectDirectory)eng\build$(ShellExtension) - - $(FlagParameterPrefix)restore $(FlagParameterPrefix)all $(FlagParameterPrefix)pack -NativeToolsOnMachine + $(FlagParameterPrefix)restore $(FlagParameterPrefix)all $(FlagParameterPrefix)pack $(FlagParameterPrefix)publish + + $(BuildActions) -NativeToolsOnMachine + + $(BuildActions) $(FlagParameterPrefix)no-build-java $(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture) true