Merge pull request #12271 from MichaelSimons/issue-2489

Handle workload manifests as text-only packages in source-build

src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml

@@ -90,12 +90,11 @@ jobs:
       artifact: $(Agent.JobName)_Artifacts_Attempt$(System.JobAttempt)
       displayName: Publish Source Build Artifacts
 
-  # TODO: Re-enable once https://github.com/dotnet/source-build/issues/2489 is fixed.
+  - script: |
-  # - script: |
+      set -x
-  #     set -x
 
-  #     docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./build.sh --run-smoke-test
+      docker run --rm -v $(_TarballDir):/tarball -w /tarball $(_Container) ./build.sh --run-smoke-test
-  #   displayName: Run Tests
+    displayName: Run Tests
 
   - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-publish-logs.yml
     parameters:

src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets

@@ -335,6 +335,59 @@
         " />
     </ItemGroup>
 
+    <ItemGroup>
+      <!-- ttf, woff, woff2, eot are permissible font related content -->
+      <AllowedTextOnlyExtensions Include="
+        .-;
+        .bowerrc;
+        .config;
+        .cs;
+        .cshtml;
+        .csproj;
+        .css;
+        .db;
+        .editorconfig;
+        .env;
+        .env.development;
+        .eot;
+        .fs;
+        .fsproj;
+        .gitignore;
+        .gitkeep;
+        .html;
+        .ico;
+        .js;
+        .json;
+        .map;
+        .md;
+        .nuspec;
+        .otf;
+        .png;
+        .props;
+        .proto;
+        .razor;
+        .sln;
+        .svg;
+        .targets;
+        .ts;
+        .ttf;
+        .tsx;
+        .txt;
+        .vb;
+        .vbproj;
+        .woff;
+        .woff2;
+        browserslist;
+        browserslistrc;
+        LICENSE;" />
+
+      <UnsupportedTextOnlyPackageContent Include="@(TextOnlyPackageContent)" />
+      <UnsupportedTextOnlyPackageContent Remove="$(TextOnlyDirectory)/**/*$([System.String]::Copy('%(AllowedTextOnlyExtensions.Identity)').ToLowerInvariant())" />
+      <UnsupportedTextOnlyPackageContent Remove="$(TextOnlyDirectory)/**/*$([System.String]::Copy('%(AllowedTextOnlyExtensions.Identity)').ToUpperInvariant())" />
+    </ItemGroup>
+
+    <Error Text="Unsupported content found in text-only packages: @(UnsupportedTextOnlyPackageContent)" Condition=" '@(UnsupportedTextOnlyPackageContent)' != '' " />
+
     <Copy
       SourceFiles="@(TextOnlyPackageContent)"
       DestinationFiles="@(TextOnlyPackageContent->'$(TextOnlyPackageTarballDir)$(DirectoryName)/%(RecursiveDir)%(Filename)%(Extension)')" />
@@ -342,3 +395,4 @@
   </Target>
 
 </Project>
+

src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj

@@ -43,6 +43,12 @@
     <PackageDownload Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0" Version="[$(AspNetCorePackageVersionFor50Templates)]" />
     <PackageDownload Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0" Version="[$(AspNetCorePackageVersionFor60Templates)]" />
 
+    <PackageDownload Include="Microsoft.NET.Sdk.Android.Manifest-6.0.100" Version="[$(XamarinAndroidWorkloadManifestVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.iOS.Manifest-6.0.100" Version="[$(XamarinIOSWorkloadManifestVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.MacCatalyst.Manifest-6.0.100" Version="[$(XamarinMacCatalystWorkloadManifestVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.macOS.Manifest-6.0.100" Version="[$(XamarinMacOSWorkloadManifestVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.Maui.Manifest-6.0.100" Version="[$(MauiWorkloadManifestVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.tvOS.Manifest-6.0.100" Version="[$(XamarinTvOSWorkloadManifestVersion)]" />
     <PackageDownload Include="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="[$(EmscriptenWorkloadManifestVersion)]" />
     <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-6.0.100" Version="[$(MonoWorkloadManifestVersion)]" />
   </ItemGroup>

src/SourceBuild/tarball/content/smoke-test.sh

@@ -522,6 +522,7 @@ function runXmlDocTests() {
 
     aspnetcoreappIgnoreList=(
         Microsoft.AspNetCore.App.Analyzers.xml
+        Microsoft.AspNetCore.App.CodeFixes.xml
         Microsoft.Extensions.Logging.Generators.resources.xml
         Microsoft.Extensions.Logging.Generators.xml
     )

src/redist/targets/BundledManifests.targets

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <!-- Restore workload manifests via PackageReference -->
-  <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
+  <ItemGroup>
     <BundledManifestsForPackageDownload Include="@(BundledManifests)" >
       <Version>[%(Version)]</Version>
     </BundledManifestsForPackageDownload>
@@ -26,8 +26,7 @@
   </ItemGroup>
 
   <Target Name="LayoutManifests"
-        DependsOnTargets="LayoutManifestsForSDK;LayoutManifestsForMSI" 
+        DependsOnTargets="LayoutManifestsForSDK;LayoutManifestsForMSI"/>
-        Condition="'$(DotNetBuildFromSource)' != 'true'"/>
 
   <Target Name="LayoutManifestsForSDK"
           DependsOnTargets="SetupBundledComponents;GenerateManifestVersions">