diff --git a/NuGet.config b/NuGet.config index f373cab4f..3d6b197f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,14 @@ - - - - - - @@ -42,15 +36,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f47ebc90..4901444ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,7 +207,7 @@ https://github.com/dotnet/arcade ac5977ebf05451c1adcf24a15d16263e4d25fd0c - + https://github.com/dotnet/source-build-reference-packages 9964206e0dd215eee4ed199b9041a94e16ba4c45 diff --git a/eng/Versions.props b/eng/Versions.props index f3b84b959..4b1d59f38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -193,7 +193,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.100 + 7.0.102-4 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 06bfd2b15..5459e8415 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 @@ -36,32 +36,32 @@ jobs: installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: CentOSStream8-Online: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.centOSStream8Container }} _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: true CentOSStream8-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.centOSStream8Container }} _EnablePoison: false _ExcludeOmniSharpTests: true _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: CentOSStream9-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.centOSStream9Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false Fedora36-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.fedora36Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _RunOnline: false Ubuntu2004-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: ${{ parameters.ubuntu2004Container }} _EnablePoison: false _ExcludeOmniSharpTests: false diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 8880b5d05..6ca72bb7a 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -236,6 +236,10 @@ + + + + diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props index d0a05029f..ced02e960 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props +++ b/src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props @@ -7,5 +7,9 @@ $(NonshippingRuntimeVersionFor700) $(NonshippingRuntimeVersionFor700) $(NonshippingRuntimeVersionFor700) + + 7.0.0 + 7.0.0 + 7.0.0 diff --git a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index a22d70373..4f2bbd079 100644 --- a/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/tarball/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -13,36 +13,40 @@ - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -73,6 +77,30 @@ Targets="CopyDownloadedPackage" Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" /> + + + + + + + + + + + + + + + + + + diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index 5d0fe449d..442c548e6 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -7,6 +7,9 @@ $(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltToolsetDir) + + $(BuildCommandArgs) /p:NativeAotSupported=false + true $(BuildCommandArgs) -v $(LogVerbosity) diff --git a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj index c1321e716..9f7c3853c 100644 --- a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj +++ b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj @@ -16,6 +16,8 @@ true + + NU1504