diff --git a/eng/pipelines/templates/variables/vmr-stage.yml b/eng/pipelines/templates/variables/vmr-stage.yml index 9566547c8..50b03acc1 100644 --- a/eng/pipelines/templates/variables/vmr-stage.yml +++ b/eng/pipelines/templates/variables/vmr-stage.yml @@ -34,6 +34,8 @@ variables: value: NetCore-Public-XL - name: defaultPoolNameLinuxArm64 value: Docker-Linux-Arm-Public + - name: defaultPoolNameMac + value: macos-12 - name: defaultPoolDemandsLinux value: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - name: defaultPoolDemandsWindows @@ -47,10 +49,9 @@ variables: value: NetCore1ESPool-Svc-Internal - name: defaultPoolNameLinuxArm64 value: Docker-Linux-Arm-Internal + - name: defaultPoolNameMac + value: macos-13-arm64 - name: defaultPoolDemandsLinux value: ImageOverride -equals Build.Ubuntu.1804.Amd64 - name: defaultPoolDemandsWindows value: ImageOverride -equals windows.vs2022.amd64 - -- name: defaultPoolNameMac - value: macos-12 diff --git a/eng/pipelines/vmr-build.yml b/eng/pipelines/vmr-build.yml index 15cc40fc4..45733f9d2 100644 --- a/eng/pipelines/vmr-build.yml +++ b/eng/pipelines/vmr-build.yml @@ -3,7 +3,7 @@ # - installer-source-build (public) # - PR: release/* and main, ultralite build # - installer-unified-build (public) -# - PR: release/* and main, lite build +# - PR: main, lite build trigger: none pr: diff --git a/src/SourceBuild/content/.gitignore b/src/SourceBuild/content/.gitignore index 2bcbb63f3..e88b2a3e8 100644 --- a/src/SourceBuild/content/.gitignore +++ b/src/SourceBuild/content/.gitignore @@ -1,11 +1,9 @@ /.dotnet +/.packages /artifacts -/eng/tools/**/bin -/eng/tools/**/obj /prereqs/packages -/src/linker/src/ILLink.Tasks/ILLink.Tasks.nuspec /src/nuget-client/NuGet.config /test/Microsoft.DotNet.SourceBuild.SmokeTests/bin /test/Microsoft.DotNet.SourceBuild.SmokeTests/obj /test/Microsoft.DotNet.SourceBuild.SmokeTests/TestResults -*.binlog \ No newline at end of file +*.binlog diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 7f57c6388..53bfbab3c 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -164,7 +164,7 @@ $([MSBuild]::NormalizeDirectory('$(PrereqsDir)', 'keys')) $([MSBuild]::NormalizeDirectory('$(PrereqsDir)', 'packages')) - $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'ArcadeBootstrapPackage')) $(NuGetPackageRoot) diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj index 04f6a25b6..10aa956ce 100644 --- a/src/SourceBuild/content/build.proj +++ b/src/SourceBuild/content/build.proj @@ -19,6 +19,21 @@ StopOnFirstFailure="true" /> + + + + + + + + + diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh index ab9c9170d..751f9a188 100755 --- a/src/SourceBuild/content/build.sh +++ b/src/SourceBuild/content/build.sh @@ -57,8 +57,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" # Set the NUGET_PACKAGES dir so that we don't accidentally pull some packages from the global location, # They should be pulled from the local feeds. -packagesDir="$scriptroot/prereqs/packages/" -packagesRestoredDir="${packagesDir}restored/" +packagesRestoredDir="$scriptroot/.packages/" export NUGET_PACKAGES=$packagesRestoredDir/ # Common settings @@ -77,6 +76,7 @@ sourceRepository='' sourceVersion='' CUSTOM_PACKAGES_DIR='' CUSTOM_SDK_DIR='' +packagesDir="$scriptroot/prereqs/packages/" packagesArchiveDir="${packagesDir}archive/" packagesPreviouslySourceBuiltDir="${packagesDir}previously-source-built/" diff --git a/src/SourceBuild/content/eng/build.ps1 b/src/SourceBuild/content/eng/build.ps1 index 35a494aa5..c13ce050a 100644 --- a/src/SourceBuild/content/eng/build.ps1 +++ b/src/SourceBuild/content/eng/build.ps1 @@ -41,7 +41,7 @@ function Get-Usage() { # Set the NUGET_PACKAGES dir so that we don't accidentally pull some packages from the global location, # They should be pulled from the local feeds. -$env:NUGET_PACKAGES="$RepoRoot\prereqs\packages\restored\" +$env:NUGET_PACKAGES="$RepoRoot\.packages\" if ($help) { Get-Usage diff --git a/src/SourceBuild/content/eng/build.sourcebuild.targets b/src/SourceBuild/content/eng/build.sourcebuild.targets index 89c9db476..b9786179f 100644 --- a/src/SourceBuild/content/eng/build.sourcebuild.targets +++ b/src/SourceBuild/content/eng/build.sourcebuild.targets @@ -9,20 +9,6 @@ $(PackageReportDir)poison-usage.xml - - - - - - - - - - + + @@ -408,75 +403,6 @@ - - - - <_BuiltIntermediatePackages Condition="'$(PackagesOutput)' != ''" Include="$(PackagesOutput)/Microsoft.SourceBuild.Intermediate.*.nupkg" Exclude="$(PackagesOutput)/*.symbols.nupkg"/> - <_BuiltIntermediatePackages Condition="'@(PackagesOutputList)' != ''" Include="%(PackagesOutputList.Identity)/Microsoft.SourceBuild.Intermediate.*.nupkg" Exclude="%(PackagesOutputList.Identity)/*.symbols.nupkg"/> - - - - <_NupkgDestinationPath>$(SourceBuiltPackagesPath) - - <_NupkgDestinationPath Condition="$([System.String]::Copy(%(_BuiltIntermediatePackages.Identity)).Contains('source-build-reference-packages'))">$(ReferencePackagesDir) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 076a28be9..4121ddb9c 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -26,10 +26,7 @@ - - + @@ -534,10 +531,7 @@ - - + AppHost$(ExeExtension) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 5cf2f0c56..058f4cf7a 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -82,8 +82,7 @@ + Properties="RuntimeVersionToInstall=%(RuntimeVersionToInstall.Identity)" /> @@ -155,9 +154,7 @@ + Targets="RunTestsAsTool" />