Merge branch 'main' into darc-main-11bd63d3-8e3e-4b0a-a81f-c162610af6e7

.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
+  # TODO: Enable once source-build is supported for 8.0 - https://github.com/dotnet/source-build/issues/3026
-    parameters:
+  # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-      dependsOn: Source_Build_Create_Tarball
+  #   - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
-      condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true')
+  #     parameters:
+  #       dependsOn: Source_Build_Create_Tarball
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - stage: Publish

eng/Version.Details.xml

@@ -168,22 +168,22 @@
       <Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
       <Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100" Version="8.0.0-alpha.1.22503.1">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100" Version="8.0.0-alpha.1.22507.3">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>38192a706fb5f5a0800d8df66720628249e2ebe8</Sha>
+      <Sha>da77353475e00302ac06010b6449d103cbbf9dce</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22503.1">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22507.3">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>38192a706fb5f5a0800d8df66720628249e2ebe8</Sha>
+      <Sha>da77353475e00302ac06010b6449d103cbbf9dce</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview5.1.22263.1">
       <Uri>https://github.com/dotnet/deployment-tools</Uri>
       <Sha>c3ad00ae84489071080a606f6a8e43c9a91a5cc2</Sha>
       <SourceBuildTarball RepoName="deployment-tools" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.22463.4">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.22507.1">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>4663cca8b51b481bfd5e82695d2027d05688b5de</Sha>
+      <Sha>09fb44e74f7b92b3080e45f0dd41ff4d8539ae0b</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="1.4.0-beta2-21475-02">
@@ -214,9 +214,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>06aceb7015f3bd2ff019ef5920d2354eb2ea2c92</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.22480.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.22507.2">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>86f1b8bab00224aad270d0524cf76d5a8779a299</Sha>
+      <Sha>bbba08adb8b3a76e49d9467dce53ea1b231828aa</Sha>
       <SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22478-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

eng/Versions.props

@@ -7,7 +7,7 @@
   <PropertyGroup>
     <VersionMajor>8</VersionMajor>
     <VersionMinor>0</VersionMinor>
-    <VersionSDKMinor>1</VersionSDKMinor>
+    <VersionSDKMinor>2</VersionSDKMinor>
     <VersionFeature>00</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
     <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
@@ -220,8 +220,8 @@
     <XamarinMacOSWorkloadManifestVersion>12.3.1006-rc.1</XamarinMacOSWorkloadManifestVersion>
     <XamarinTvOSWorkloadManifestVersion>15.4.1006-rc.1</XamarinTvOSWorkloadManifestVersion>
     <MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
-    <MicrosoftNETWorkloadEmscriptennet6Manifest80100Version>8.0.0-alpha.1.22503.1</MicrosoftNETWorkloadEmscriptennet6Manifest80100Version>
+    <MicrosoftNETWorkloadEmscriptennet6Manifest80100Version>8.0.0-alpha.1.22507.3</MicrosoftNETWorkloadEmscriptennet6Manifest80100Version>
-    <MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22503.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
+    <MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22507.3</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
     <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version)</EmscriptenWorkloadManifestVersion>
   </PropertyGroup>
   <PropertyGroup>

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

src/SourceBuild/tarball/content/repos/roslyn.proj

@@ -21,23 +21,6 @@
     <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <!--
-      From roslyn Versions.props:
-        The version of Roslyn we build Source Generators against that are built in this
-         repository. This must be lower than MicrosoftNetCompilersToolsetVersion,
-         but not higher than our minimum dogfoodable Visual Studio version, or else
-         the generators we build would load on the command line but not load in IDEs.
-      In source-build these don't need to be pinned and can use the source-built versions since it doesn't
-      need to support VS.
-    -->
-    <ExtraPackageVersionPropsPackageInfo Include="SourceGeneratorMicrosoftCodeAnalysisVersion" Version="%24(MicrosoftCodeAnalysisCommonVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemCollectionsImmutableVersion" Version="%24(SystemCollectionsImmutableVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemReflectionMetadataVersion" Version="%24(SystemReflectionMetadataVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemRuntimeCompilerServicesUnsafeVersion" Version="%24(SystemRuntimeCompilerServicesUnsafeVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemTextEncodingCodePagesVersion" Version="%24(SystemTextEncodingCodePagesVersion)" />
-  </ItemGroup>
-
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="command-line-api" />

src/SourceBuild/tarball/patches/roslyn/0001-lift-version-of-Microsoft.CodeAnalysis.Common-depend.patch

@@ -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 @@
-     <Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\Syntax\SyntaxKindFacts.cs" Link="Grammar\SyntaxKindFacts.cs" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
- 
-     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(SourceGeneratorMicrosoftCodeAnalysisVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-+    <PackageReference Include="System.Collections.Immutable" Version="$(SourceBuildLiftedSystemCollectionsImmutableVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-+    <PackageReference Include="System.Reflection.Metadata" Version="$(SourceBuildLiftedSystemReflectionMetadataVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SourceBuildLiftedSystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-+    <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SourceBuildLiftedSystemTextEncodingCodePagesVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-   </ItemGroup>
- </Project>
-\ No newline at end of file

src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MichaelSimons <msimons@microsoft.com>
-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 @@
-     <!-- Source build does not need to worry about running on VS for Mac -->
-     <ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>
- 
--    <!-- Disable implict package target fallback, and disable warning for when we explicitly add it (currently needed for
--         Microsoft.ApplicationInsights) -->
--    <NoWarn>$(NoWarn);NU1701</NoWarn>
-+    <!--
-+      NU1701 - Disable implict package target fallback, and disable warning for when we explicitly add it (currently needed forMicrosoft.ApplicationInsights)
-+      CA1420 - Temporarily disable for source-build until SDK builds with latest toolset.
-+    -->
-+    <NoWarn>$(NoWarn);NU1701;CA1420</NoWarn>
-     <!-- do not enable analyzers on source build-->
-     <EnforceCodeStyleInBuild Condition="'$(DotNetBuildFromSource)' != 'true'">true</EnforceCodeStyleInBuild>
-     <DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>

test/SdkTests/TestConfig.xml

@@ -45,105 +45,21 @@
   </TestList>
   
   <SkippedTests>
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToUseVB.It_builds_a_vb_wpf_app"
-            Skip="true"
-            Issue="https://github.com/dotnet/wpf/issues/1734"
-            Reason="VB templates removed from wpf"/>
-
     <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_portable_apps_to_the_publish_folder_and_the_app_should_run"
             Skip="true"
             Issue="https://github.com/dotnet/sdk/pull/3574"
             Reason="Test update needed (in PR)"/>
-
-    <!-- <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_targets_the_right_framework_depending_on_output_type"
-            Skip="true"
-            Issue=""
-            Reason="Test needs to be updated with new patches (along with SDK stage 0 update)"/> -->
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_RID_specific_runnable_output"
-            Skip="true"
-            Issue=""
-            Reason="Test doesn't work with newer RIDs"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_framework_dependent_RID_specific_runnable_output"
-            Skip="true"
-            Issue=""
-            Reason="Test doesn't work with newer RIDs"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_handles_mismatched_implicit_package_versions"
-            Skip="true"
-            Issue=""
-            Reason="Test doesn't work with newer RIDs"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithTransitiveProjectRefs.It_builds_the_project_successfully"
-            Skip="true"
-            Issue=""
-            Reason="Needs .NET Core 1.1"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrary.It_builds_the_project_successfully"
-            Skip="true"
-            Issue=""
-            Reason="Needs .NET Core 1.1"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrary.It_builds_the_project_successfully_twice"
-            Skip="true"
-            Issue=""
-            Reason="Needs .NET Core 1.1"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantAllResourcesInSatellite.TestSatelliteResources"
-            Skip="true"
-            Issue=""
-            Reason="Needs .NET Core 1.1"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantAllResourcesInSatellite.It_retrieves_strings_successfully"
-            Skip="true"
-            Issue=""
-            Reason="Needs .NET Core 1.1"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThereAreDefaultItems.Compile_items_can_be_explicitly_specified_while_default_EmbeddedResource_items_are_used"
-            Skip="true"
-            Issue=""
-            Reason="Needs .NET Core 1.1"/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildASelfContainedApp.It_succeeds_when_RuntimeIdentifier_and_PlatformTarget_mismatch_but_PT_is_AnyCPU"
-            Skip="true"
-            Issue=""
-            Reason="Needs .NET Core 1.1"/>
-
-    <!-- <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildADesktopExeWithFSharp.It_builds_a_simple_desktop_app"
-            Skip="true"
-            Issue="https://github.com/dotnet/coreclr/issues/27275"
-            Reason="F# compiler is failing on .NET 5 runtime"
-            />
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildALibraryWithFSharp.It_builds_the_library_successfully"
-            Skip="true"
-            Issue="https://github.com/dotnet/coreclr/issues/27275"
-            Reason="F# compiler is failing on .NET 5 runtime"
-            /> -->
-
-    <Method Name="Microsoft.NET.Publish.Tests.PublishWpfApp.It_publishes_and_runs_self_contained_wpf_app"
-            Skip="true"
-            Issue=""
-            Reason="Assumes `dotnet new wpf`produces a netcoreapp3.1 app, will get fixed when sdk takes .NET 5 stage 0"
-            />
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps.It_does_not_download_desktop_targeting_packs_on_unix"
-            Skip="true"
-            Issue=""
-            Reason="Assumes netcoreapp3.1 targeting pack is bundled, which it is not in 5.0 SDK. Will resolve when sdk takes newer stage 0 and hits same issue."/>
-
-    <Method Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps.It_builds_on_windows_with_the_windows_desktop_sdk"
-            Skip="true"
-            Issue="https://github.com/dotnet/wpf/issues/2363"
-            Reason="Desktop SDK missing required files."/>
     <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_runs_single_file_apps"
             Skip="true"
             Issue=""
             Reason="Need all .NET core runtime"/>
-    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_verify_analysis_warnings_hello_world_app"
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_RID_specific_runnable_output"
             Skip="true"
             Issue=""
-            Reason="https://github.com/dotnet/installer/pull/8966#issuecomment-721111308"/>
+            Reason="Test doesn't work with newer RIDs"/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_framework_dependent_RID_specific_runnable_output"
+            Skip="true"
+            Issue=""
+            Reason="Test doesn't work with newer RIDs"/>
   </SkippedTests>
 </Tests>