diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 31f268615..8dca6c38d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -347,10 +347,11 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball - condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true') + # TODO: Enable once source-build is supported for 8.0 - https://github.com/dotnet/source-build/issues/3026 + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - stage: Publish diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a01a88a6b..019dc674d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,22 +168,22 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 38192a706fb5f5a0800d8df66720628249e2ebe8 + da77353475e00302ac06010b6449d103cbbf9dce - + https://github.com/dotnet/emsdk - 38192a706fb5f5a0800d8df66720628249e2ebe8 + da77353475e00302ac06010b6449d103cbbf9dce https://github.com/dotnet/deployment-tools c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 4663cca8b51b481bfd5e82695d2027d05688b5de + 09fb44e74f7b92b3080e45f0dd41ff4d8539ae0b @@ -214,9 +214,9 @@ https://github.com/dotnet/runtime 06aceb7015f3bd2ff019ef5920d2354eb2ea2c92 - + https://github.com/dotnet/source-build-reference-packages - 86f1b8bab00224aad270d0524cf76d5a8779a299 + bbba08adb8b3a76e49d9467dce53ea1b231828aa diff --git a/eng/Versions.props b/eng/Versions.props index f67721ddb..a1bbb618e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 8 0 - 1 + 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) alpha @@ -220,8 +220,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.0-alpha.1.22503.1 - 8.0.0-alpha.1.22503.1 + 8.0.0-alpha.1.22507.3 + 8.0.0-alpha.1.22507.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) 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 2634d392f..3c3ba9ecf 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 @@ -74,17 +74,3 @@ jobs: displayName: Publish BuildLogs continueOnError: true condition: succeededOrFailed() - - - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - # Check if the tarball should be built now so the result can be used in the build tarball job condition. - # 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/*' - then - echo "##vso[task.setvariable variable=_includeTarballBuild;isoutput=true]true" - fi - displayName: Tarball Build Check - name: Tarball_Build_Check - # Disable tarball CI until .NET 8.0 is source-buildable - condition: false diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj index 29e53696f..bdc856b21 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn.proj @@ -21,23 +21,6 @@ $(ProjectDirectory)global.json - - - - - - - - - diff --git a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch b/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch deleted file mode 100644 index 6096888d1..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Logan Bussell <36081148+lbussell@users.noreply.github.com> -Date: Thu, 21 Oct 2021 23:15:23 +0000 -Subject: [PATCH 1/2] lift version of Microsoft.CodeAnalysis.Common - dependencies to previously source built versions - -Requires https://github.com/dotnet/source-build/issues/2482 in order to eliminate this patch ---- - .../Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj -index 7eae8afa275..a50822a6aeb 100644 ---- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj -+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj -@@ -27,5 +27,9 @@ - - - -+ -+ -+ -+ - - -\ No newline at end of file diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch b/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch deleted file mode 100644 index daaa95b6a..000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Mon, 25 Jul 2022 19:15:47 +0000 -Subject: [PATCH 1/2] Disable CA1420 - -Workaround until NuGet updates to build with latest .NET toolset. ---- - Directory.Build.props | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 1353696a29..4e7463a453 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -14,9 +14,11 @@ - - $(SdkTargetFramework) - -- -- $(NoWarn);NU1701 -+ -+ $(NoWarn);NU1701;CA1420 - - true - true diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 7f25ca27a..6da9c5284 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -45,105 +45,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Reason="Test doesn't work with newer RIDs"/> +