Merge remote-tracking branch 'origin/main' into mac-vmr

eng/Version.Details.xml

@@ -174,6 +174,11 @@
       <Sha>74e4868be8423562ba8ec2aac522f94a8c2c9f37</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
+    <Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23557.2">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspire</Uri>
+      <Sha>48e42f59d64d84b404e904996a9ed61f2a17a569</Sha>
+      <SourceBuild RepoName="aspire" ManagedOnly="true" />
+    </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.23509.2" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/deployment-tools</Uri>
       <Sha>1d174267bf45dabbadb12602b1170329611fd219</Sha>
@@ -235,9 +240,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23608.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.23611.3">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>9e09ace1897546ac85dab114a6e1a5b6f773db7a</Sha>
+      <Sha>229464299759d6667e8b907d9c321d31a8dcc123</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="8.0.0-preview.23424.2">

eng/Versions.props

@@ -252,8 +252,8 @@
   </PropertyGroup>
   <!-- Workload manifest package versions -->
   <PropertyGroup>
-    <AspireFeatureBand>8.0.100-rc.1</AspireFeatureBand>
+    <AspireFeatureBand>8.0.100</AspireFeatureBand>
-    <AspireWorkloadManifestVersion>8.0.0-alpha.23471.13</AspireWorkloadManifestVersion>
+    <AspireWorkloadManifestVersion>8.0.0-preview.1.23557.2</AspireWorkloadManifestVersion>
     <MauiFeatureBand>8.0.100-rc.1</MauiFeatureBand>
     <MauiWorkloadManifestVersion>8.0.0-rc.1.9171</MauiWorkloadManifestVersion>
     <XamarinAndroidWorkloadManifestVersion>34.0.0-rc.1.432</XamarinAndroidWorkloadManifestVersion>

eng/pipelines/source-build-sdk-diff-tests.yml

@@ -36,6 +36,13 @@ jobs:
     architecture: x64
     dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}
 
+- template: templates/jobs/sdk-diff-tests.yml
+  parameters:
+    buildName: Alpine317_Offline_MsftSdk
+    targetRid: alpine.3.17-x64
+    architecture: x64
+    dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}
+
 - template: templates/jobs/sdk-diff-tests.yml
   parameters:
     buildName: Fedora39_Offline_MsftSdk

eng/pipelines/templates/jobs/sdk-diff-tests.yml

@@ -57,7 +57,7 @@ jobs:
 
   - template: ../steps/download-pipeline-artifact.yml
     parameters:
-      patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(alpha|preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz'
+      patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(alpha|preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz'
       displayName: Download MSFT SDK
 
   - template: ../steps/download-vmr-artifact.yml
@@ -75,7 +75,11 @@ jobs:
       displayName: Download Source Built Artifacts
 
   - script: |
-      msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;)
+      platform="linux"
+      if [[ ${{ parameters.targetRid }} =~ "alpine" ]]; then
+        platform="$platform-musl"
+      fi
+      msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;)
 
       if [[ -z "$msft_sdk_tarball_name" ]]; then
         echo "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build https://dev.azure.com/dnceng/internal/_build/results?buildId=$(InstallerBuildId) might have failed."
@@ -98,6 +102,7 @@ jobs:
 
       eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore
 
+      echo "##vso[task.setvariable variable=Platform]$platform"
       echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name"
       echo "##vso[task.setvariable variable=SdkTarballPath]$(Pipeline.Workspace)/Artifacts/$sdk_tarball_name"
       echo "##vso[task.setvariable variable=SourceBuiltArtifactsPath]$(Pipeline.Workspace)/Artifacts/$artifacts_path"
@@ -120,7 +125,7 @@ jobs:
       -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=false
       -e SMOKE_TESTS_RUNNING_IN_CI=true
       -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }}
-      -e SMOKE_TESTS_PORTABLE_RID=linux-${{ parameters.architecture }}
+      -e SMOKE_TESTS_PORTABLE_RID=$(Platform)-${{ parameters.architecture }}
       -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH=
       -e SMOKE_TESTS_INCLUDE_ARTIFACTSSIZE=${{ parameters.includeArtifactsSize }}
     displayName: Run Tests

src/SourceBuild/content/Directory.Build.props

@@ -172,6 +172,7 @@
     <PortableRid Condition="'$(PortableRid)' == '' AND '$(TargetOS)' == 'FreeBSD'">freebsd-$(TargetPlatform)</PortableRid>
     <PortableRid Condition="'$(PortableRid)' == '' AND '$(TargetOS)' == 'OSX'">osx-$(TargetPlatform)</PortableRid>
     <PortableRid Condition="'$(PortableRid)' == '' AND '$(TargetOS)' == 'Linux'">linux-$(TargetPlatform)</PortableRid>
+    <PortableRid Condition="$(TargetRid.StartsWith('linux-musl')) or $(TargetRid.StartsWith('alpine'))">linux-musl-$(TargetPlatform)</PortableRid>
     <PortableRid Condition="'$(PortableRid)' == '' AND '$(TargetOS)' == 'Windows_NT'">win-$(TargetPlatform)</PortableRid>
     <TargetRid Condition="'$(PortableBuild)' == 'true' AND '$(PortableRid)' != ''">$(PortableRid)</TargetRid>
   </PropertyGroup>

src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props

@@ -5,21 +5,5 @@
     <NonshippingRuntimeVersionFor700>7.0.4-servicing.23107.6</NonshippingRuntimeVersionFor700>
     
     <MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETCoreTestHostVersion>
-
-    <Msft80RC2RuntimeVersion>8.0.0-rc.2.23479.6</Msft80RC2RuntimeVersion>
-    <MicrosoftNETCoreAppCrossgen2Version>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppCrossgen2Version>
-    <MicrosoftNETCoreAppHostPackageVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppHostPackageVersion>
-    <MicrosoftNETCoreAppRefVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppRefVersion>
-    <MicrosoftNETCoreAppRuntimeVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreAppRuntimeVersion>
-    <MicrosoftNETILLinkTasksVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETILLinkTasksVersion>
-    <MicrosoftDotNetILCompilerVersion>$(Msft80RC2RuntimeVersion)</MicrosoftDotNetILCompilerVersion>
-    <MicrosoftNETCoreDotNetAppHostVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreDotNetAppHostVersion>
-    <MicrosoftNETCoreDotNetHostVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreDotNetHostVersion>
-    <MicrosoftNETCoreDotNetHostPolicyVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreDotNetHostPolicyVersion>
-    <MicrosoftNETCoreDotNetHostResolverVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreDotNetHostResolverVersion>
-    <MicrosoftNETCoreILAsmVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreILAsmVersion>
-    <MicrosoftNETCoreILDAsmVersion>$(Msft80RC2RuntimeVersion)</MicrosoftNETCoreILDAsmVersion>
-    <RuntimeNativeSystemIOPortsVersion>$(Msft80RC2RuntimeVersion)</RuntimeNativeSystemIOPortsVersion>
-    
   </PropertyGroup>
 </Project>

src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj

@@ -36,9 +36,6 @@
 
     <PortablePackage Include="Microsoft.DotNet.ILCompiler" Version="[$(MicrosoftDotNetILCompilerVersion)]" />
     <PortablePackage Include="Microsoft.NETCore.DotNetAppHost" Version="[$(MicrosoftNETCoreDotNetAppHostVersion)]" />
-    <PortablePackage Include="Microsoft.NETCore.DotNetHost" Version="[$(MicrosoftNETCoreDotNetHostVersion)]" />
-    <PortablePackage Include="Microsoft.NETCore.DotNetHostPolicy" Version="[$(MicrosoftNETCoreDotNetHostPolicyVersion)]" />
-    <PortablePackage Include="Microsoft.NETCore.DotNetHostResolver" Version="[$(MicrosoftNETCoreDotNetHostResolverVersion)]" />
     <PortablePackage Include="Microsoft.NETCore.ILAsm" Version="[$(MicrosoftNETCoreILAsmVersion)]" />
     <PortablePackage Include="Microsoft.NETCore.ILDAsm" Version="[$(MicrosoftNETCoreILDAsmVersion)]" />
     <PortablePackage Include="Microsoft.NETCore.TestHost" Version="[$(MicrosoftNETCoreTestHostVersion)]" />
@@ -47,9 +44,6 @@
     <!-- These packages don't actually exist -->
     <ExcludedPackage Include="runtime.linux-musl-x64.runtime.native.System.IO.Ports" />
     <ExcludedPackage Include="runtime.linux-musl-arm64.runtime.native.System.IO.Ports" />
-
-    <PackageDownload Include="Microsoft.NET.ILLink.Tasks" Version="[$(MicrosoftNETILLinkTasksVersion)]" />
-    <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(MicrosoftNETCoreAppRefVersion)]" />
   </ItemGroup>
 
   <Target Name="GetPackagesToDownload"

src/SourceBuild/content/eng/pipelines/ci.yml

@@ -18,8 +18,7 @@ trigger:
 pr: none
 
 stages:
-- ${{ if ne(variables['Build.Reason'], 'Schedule') }}:
+- template: templates/stages/vmr-scan.yml
-  - template: templates/stages/vmr-scan.yml
 
 - template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml
   parameters:

src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/CheckForPoison.cs

@@ -347,7 +347,8 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection
             using var peReader = new PEReader(stream);
 
             MetadataReader reader = peReader.GetMetadataReader();
-            return reader.CustomAttributes.Select(attrHandle => reader.GetCustomAttribute(attrHandle))
+            return reader.CustomAttributes
+                    .Select(attrHandle => reader.GetCustomAttribute(attrHandle))
                     .Any(attr => IsAttributeSbrp(reader, attr));
         }
 
@@ -357,13 +358,23 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection
 
             if (attr.Constructor.Kind == HandleKind.MemberReference)
             {
-                MemberReference mref = reader.GetMemberReference((MemberReferenceHandle)attr.Constructor);
+                var mref = reader.GetMemberReference((MemberReferenceHandle)attr.Constructor);
-
                 if (mref.Parent.Kind == HandleKind.TypeReference)
                 {
-                    TypeReference tref = reader.GetTypeReference((TypeReferenceHandle)mref.Parent);
+                    var tref = reader.GetTypeReference((TypeReferenceHandle)mref.Parent);
                     attributeType = $"{reader.GetString(tref.Namespace)}.{reader.GetString(tref.Name)}";
                 }
+                else if (mref.Parent.Kind == HandleKind.TypeDefinition)
+                {
+                    var tdef = reader.GetTypeDefinition((TypeDefinitionHandle)mref.Parent);
+                    attributeType = $"{reader.GetString(tdef.Namespace)}.{reader.GetString(tdef.Name)}";
+                }
+            }
+            else if (attr.Constructor.Kind == HandleKind.MethodDefinition)
+            {
+                var mdef = reader.GetMethodDefinition((MethodDefinitionHandle)attr.Constructor);
+                var tdef = reader.GetTypeDefinition(mdef.GetDeclaringType());
+                attributeType = $"{reader.GetString(tdef.Namespace)}.{reader.GetString(tdef.Name)}";
             }
 
             if (attributeType == SbrpAttributeType)
@@ -371,7 +382,7 @@ namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection
                 var decodedValue = attr.DecodeValue(DummyAttributeTypeProvider.Instance);
                 try
                 {
-                    return decodedValue.FixedArguments[0].Value.ToString() == "source" && decodedValue.FixedArguments[1].Value.ToString() == "source-build-reference-packages";
+                    return decodedValue.FixedArguments[0].Value?.ToString() == "source" && decodedValue.FixedArguments[1].Value?.ToString() == "source-build-reference-packages";
                 }
                 catch
                 {

src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.SourceBuild.Tasks.LeakDetection/DummyAttributeTypeProvider.cs

@@ -7,28 +7,31 @@ using System.Reflection;
 using System.Reflection.Metadata;
 using System.Reflection.Metadata.Ecma335;
 
+#nullable enable
+
 namespace Microsoft.DotNet.SourceBuild.Tasks.LeakDetection
 {
 
     // An empty ICustomAttributeTypeProvider implementation is necessary to read metadata attribute values.
-    internal class DummyAttributeTypeProvider : ICustomAttributeTypeProvider<Type>
+    internal class DummyAttributeTypeProvider : ICustomAttributeTypeProvider<Type?>
     {
         public static readonly DummyAttributeTypeProvider Instance = new();
 
-        public Type GetPrimitiveType(PrimitiveTypeCode typeCode) => default(Type);
+        public Type? GetPrimitiveType(PrimitiveTypeCode typeCode) => default(Type);
 
-        public Type GetSystemType() => default(Type);
+        public Type? GetSystemType() => default(Type);
 
-        public Type GetSZArrayType(Type elementType) => default(Type);
+        public Type? GetSZArrayType(Type? elementType) => default(Type);
 
-        public Type GetTypeFromDefinition(MetadataReader reader, TypeDefinitionHandle handle, byte rawTypeKind) => default(Type);
+        public Type? GetTypeFromDefinition(MetadataReader reader, TypeDefinitionHandle handle, byte rawTypeKind) => default(Type);
 
-        public Type GetTypeFromReference(MetadataReader reader, TypeReferenceHandle handle, byte rawTypeKind) => default(Type);
+        public Type? GetTypeFromReference(MetadataReader reader, TypeReferenceHandle handle, byte rawTypeKind) => default(Type);
 
-        public Type GetTypeFromSerializedName(string name) => default(Type);
+        public Type? GetTypeFromSerializedName(string name) => default(Type);
 
-        public PrimitiveTypeCode GetUnderlyingEnumType(Type type) => default(PrimitiveTypeCode);
+        public PrimitiveTypeCode GetUnderlyingEnumType(Type? type) => default(PrimitiveTypeCode);
         
-        public bool IsSystemType(Type type) => default(bool);
+        public bool IsSystemType(Type? type) => default(bool);
     }
 }
+

src/SourceBuild/content/repo-projects/aspire.proj

@@ -0,0 +1,13 @@
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
+  <PropertyGroup>
+    <BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <RepositoryReference Include="arcade" />
+  </ItemGroup>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>

src/SourceBuild/content/repo-projects/dotnet.proj

@@ -44,6 +44,7 @@
     <RepositoryReference Include="fsharp" />
     <RepositoryReference Include="vstest" />
     <RepositoryReference Include="sdk" />
+    <RepositoryReference Include="aspire" />
     <RepositoryReference Include="installer" />
 
     <!-- Package source-build artifacts -->

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs

@@ -36,10 +36,9 @@ public class BasicScenarioTests : SdkTests
                 // R2R is not supported on Mono (see https://github.com/dotnet/runtime/issues/88419#issuecomment-1623762676)
                 DotNetActions.Build | DotNetActions.Run | (DotNetHelper.ShouldPublishComplex() ? DotNetActions.None : DotNetActions.PublishComplex) | (helper.IsMonoRuntime ? DotNetActions.None : DotNetActions.PublishR2R));
             yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.ClassLib, DotNetActions.Build | DotNetActions.Publish);
-            // TODO: Uncomment when test templates are updated to net9.0: https://github.com/dotnet/source-build/issues/3668
+            yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.XUnit,    DotNetActions.Test);
-            // yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.XUnit,    DotNetActions.Test);
+            yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.NUnit,    DotNetActions.Test);
-            // yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.NUnit,    DotNetActions.Test);
+            yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.MSTest,   DotNetActions.Test);
-            // yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.MSTest,   DotNetActions.Test);
         }
     }
 }

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs

@@ -166,12 +166,23 @@ public class LicenseScanTests : TestBase
         string baselineName = $"Licenses.{_targetRepo}.json";
 
         string baselinePath = BaselineHelper.GetBaselineFilePath(baselineName, BaselineSubDir);
-        if (!File.Exists(baselinePath))
+        string expectedFilePath = Path.Combine(LogsDirectory, baselineName);
+        if (File.Exists(baselinePath))
         {
-            Assert.Fail($"No license baseline file exists for repo '{_targetRepo}'. Expected file: {baselinePath}");
+            File.Copy(baselinePath, expectedFilePath, overwrite: true);
+        }
+        else
+        {
+            // If there is no license baseline, generate a default empty one.
+            ScancodeResults defaultResults = new();
+            string defaultResultsJson = JsonSerializer.Serialize(defaultResults, options);
+            File.WriteAllText(expectedFilePath, defaultResultsJson);
         }
 
-        BaselineHelper.CompareBaselineContents(baselineName, json, OutputHelper, Config.WarnOnLicenseScanDiffs, BaselineSubDir);
+        string actualFilePath = Path.Combine(TestBase.LogsDirectory, $"Updated{baselineName}");
+        File.WriteAllText(actualFilePath, json);
+
+        BaselineHelper.CompareFiles(expectedFilePath, actualFilePath, OutputHelper, Config.WarnOnLicenseScanDiffs);
     }
 
     private LicenseExclusion ParseLicenseExclusion(string rawExclusion)

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs

@@ -56,7 +56,7 @@ public class SourceBuiltArtifactsTests : SdkTests
             DirectoryInfo sdkDir = new DirectoryInfo(Path.Combine(outputDir, "sdk"));
             string sdkVersionPath = sdkDir.GetFiles(".version", SearchOption.AllDirectories).Single().FullName;
             string[] sdkVersionLines = File.ReadAllLines(Path.Combine(outputDir, sdkVersionPath));
-            string expectedSdkVersion = sdkVersionLines[1];
+            string expectedSdkVersion = sdkVersionLines[3];  // Get the unique, non-stable, SDK version
 
             Assert.Equal(expectedSdkVersion, sdkVersion);
         }

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.arcade.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspnetcore.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.cecil.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.command-line-api.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.deployment-tools.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.diagnostics.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.emsdk.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.format.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.fsharp.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.installer.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.msbuild.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.nuget-client.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.razor.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn-analyzers.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.roslyn.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.scenario-tests.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sdk.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.source-build-reference-packages.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.sourcelink.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.symreader.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.templating.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.test-templates.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.vstest.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.windowsdesktop.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.winforms.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.wpf.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xdt.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.xliff-tasks.json

@@ -1,3 +0,0 @@
-{
-  "files": []
-}

src/VirtualMonoRepo/source-mappings.json

@@ -60,6 +60,13 @@
                 "src/Microsoft.DotNet.SignTool.Tests/*.vsix"
             ]
         },
+        {
+            "name": "aspire",
+            "defaultRemote": "https://github.com/dotnet/aspire",
+            "exclude": [
+                "src/Aspire.Dashboard/**/*"
+            ]
+        },
         {
             "name": "aspnetcore",
             "defaultRemote": "https://github.com/dotnet/aspnetcore",

src/redist/targets/BundledManifests.targets

@@ -4,7 +4,6 @@
   </PropertyGroup>
   <ItemGroup>
     <BundledManifests Include="Microsoft.NET.Sdk.Android" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinAndroidWorkloadManifestVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
-    <BundledManifests Include="Microsoft.NET.Sdk.Aspire" FeatureBand="$(AspireFeatureBand)" Version="$(AspireWorkloadManifestVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
     <BundledManifests Include="Microsoft.NET.Sdk.iOS" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinIOSWorkloadManifestVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
     <BundledManifests Include="Microsoft.NET.Sdk.MacCatalyst" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinMacCatalystWorkloadManifestVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
     <BundledManifests Include="Microsoft.NET.Sdk.macOS" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinMacOSWorkloadManifestVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
@@ -19,6 +18,7 @@
     <BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net6" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
     <BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net7" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
     <BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net8" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
+    <BundledManifests Include="Microsoft.NET.Sdk.Aspire" FeatureBand="$(AspireFeatureBand)" Version="$(AspireWorkloadManifestVersion)" />
   </ItemGroup>
 
   <!-- Calculate NuGet package IDs for bundled manifests -->

src/redist/targets/Crossgen.targets

@@ -2,7 +2,7 @@
   <!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR.
        Neither crossgen2 nor mono is supported on the loongarch64 architecture at present. -->
   <Target Name="CrossgenLayout"
-          Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le' AND '$(Architecture)' != 'loongarch64'"
+          Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le' AND '$(Architecture)' != 'loongarch64' AND !('$(CROSSBUILD)' == 'true' AND '$(DotnetBuildVertical)' == 'true')"
           DependsOnTargets="SetSdkBrandingInfo">
 
     <PropertyGroup>

src/redist/targets/GenerateLayout.targets

@@ -38,7 +38,7 @@
 
       <CoreSetupRid Condition="'$(CoreSetupRid)' == ''">$(HostRid)</CoreSetupRid>
       <CoreSetupRid Condition=" ('$(OSName)' == 'win' or '$(OSName)' == 'osx' or '$(OSName)' == 'freebsd') and '$(DotNetBuildFromSource)' != 'true' ">$(OSName)-$(Architecture)</CoreSetupRid>
-      <CoreSetupRid Condition="'$(DotNetBuildVertical)' != 'true' and $(HostRid.StartsWith('mariner.2.0'))">$(HostRid.Replace('mariner.2.0', 'cm.2'))</CoreSetupRid>
+      <CoreSetupRid Condition="'$(DotNetBuildVertical)' != 'true' and $(CoreSetupRid.StartsWith('mariner.2.0'))">$(HostRid.Replace('mariner.2.0', 'cm.2'))</CoreSetupRid>
 
       <!-- only the runtime OSX .pkgs have a `-internal` suffix -->
       <InstallerStartSuffix Condition="$([MSBuild]::IsOSPlatform('OSX'))">-internal</InstallerStartSuffix>

src/redist/targets/GenerateMSIs.targets

@@ -321,6 +321,11 @@
           <ReadLinesFromFile File="$(MinimumMSBuildVersionFile)">
             <Output TaskParameter="Lines" PropertyName="MinimumVSVersion"/>
           </ReadLinesFromFile>
+
+          <PropertyGroup Condition=" '$(VersionSDKMinor)' == '1' and '$(StabilizePackageVersion)' == 'true' ">
+            <MinimumVSVersion>$(MinimumVSVersion.Substring(0,$(MinimumVSVersion.LastIndexOf('.'))))</MinimumVSVersion>
+            <MinimumVSVersion >$([MSBuild]::Add($(MinimumVSVersion), .1))</MinimumVSVersion>
+          </PropertyGroup>
   </Target>
 
   <Target Name="GenerateSdkBundle"