[VMR] Codeflow 4177291-4177291

[[ commit created by automation ]]

Author: dotnet-maestro[bot]

Directory.Build.props

@@ -23,6 +23,7 @@
     <HostOSName Condition="'$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('ILLUMOS'))">illumos</HostOSName>
     <HostOSName Condition="'$(HostOSName)' == '' AND '$(IsLinux)' == 'true'">linux</HostOSName>
 
+    <OSName Condition="'$(OSName)' == '' AND $(PortableTargetRid) != ''">$(PortableTargetRid.Substring(0, $(PortableTargetRid.LastIndexOf('-'))))</OSName>
     <OSName Condition="'$(OSName)' == '' AND $(TargetRid) != ''">$(TargetRid.Substring(0, $(TargetRid.LastIndexOf('-'))))</OSName>
     <OSName Condition="'$(OSName)' == ''">$(HostOSName)</OSName>
   </PropertyGroup>

eng/Publishing.props

@@ -13,7 +13,8 @@
 
        These packages have already been signed by the FSharp build so we don't need to re-include them for signing. -->
   <PropertyGroup Condition="'$(EnableDefaultArtifacts)' == 'true'">
-    <FSharpCorePath Condition="'$(DotNetFinalVersionKind)' != 'release'">Shipping</FSharpCorePath>
+    <FSharpCorePath Condition="'$(DotNetFinalVersionKind)' == ''">Shipping</FSharpCorePath>
+    <FSharpCorePath Condition="'$(DotNetFinalVersionKind)' == 'prerelease'">PreRelease</FSharpCorePath>
     <FSharpCorePath Condition="'$(DotNetFinalVersionKind)' == 'release'">Release</FSharpCorePath>
 
     <!--

src/Layout/Directory.Build.props

@@ -33,9 +33,8 @@
     <TargetRid Condition="'$(TargetRid)' == ''">$(OSName)-$(TargetArchitecture)</TargetRid>
     <ProductMonikerRid>$(TargetRid)</ProductMonikerRid>
 
-    <PortableOSName Condition="'$(PortableOSName)' == ''">$(OSName)</PortableOSName>
-    <PortableRid>$(PortableOSName)-$(TargetArchitecture)</PortableRid>
-    <PortableProductMonikerRid>$(PortableRid)</PortableProductMonikerRid>
+    <PortableTargetRid Condition="'$(PortableTargetRid)' == ''">$(OSName)-$(TargetArchitecture)</PortableTargetRid>
+    <PortableProductMonikerRid>$(PortableTargetRid)</PortableProductMonikerRid>
   </PropertyGroup>
 
   <PropertyGroup>

src/Layout/pkg/dotnet-sdk.proj

@@ -8,7 +8,6 @@
     <GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
     <BuildDebPackage Condition="'$(BuildSdkDeb)' == 'true'">true</BuildDebPackage>
     <BuildRpmPackage Condition="'$(BuildSdkRpm)' == 'true'">true</BuildRpmPackage>
-    <UseArcadeRpmTooling>true</UseArcadeRpmTooling>
     <ProductBrandPrefix>Microsoft .NET</ProductBrandPrefix>
     <LicenseFile>$(RepoRoot)LICENSE.TXT</LicenseFile>
     <InstallerName>dotnet-sdk</InstallerName>
@@ -99,7 +98,7 @@
   </Target>
 
   <Target Name="AddLinuxPackageInformation"
-      BeforeTargets="GetDebInstallerJsonProperties;GetRpmInstallerJsonProperties"
+      BeforeTargets="GetAdditionalLinuxInstallerProperties"
       DependsOnTargets="CalculateLinuxNativeInstallerDependencyVersions">
 
     <PropertyGroup>

src/Layout/redist/targets/GenerateBundledVersions.targets

@@ -398,7 +398,7 @@
         win-x86;
         " />
 
-      <!-- ILCompiler target RIDs that are officially supported, plus the architecture we are building the product for (OutputRID). See:
+      <!-- ILCompiler target RIDs that are officially supported, plus the architecture we are building the product for (TargetRid). See:
            https://github.com/dotnet/runtime/blob/main/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props -->
       <ILCompilerSupportedRids Include="
         @(Net90ILCompilerSupportedRids);

src/Layout/redist/targets/RestoreLayout.targets

@@ -126,6 +126,12 @@
       PackageVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
       RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
 
+    <BundledLayoutPackage Include="Microsoft.NETCore.App.Runtime.NativeAOT.$(SharedFrameworkRid)"
+      Condition="'$(BundleNativeAotCompiler)' == 'true'"
+      PackageName="Microsoft.NETCore.App.Runtime.NativeAOT.$(SharedFrameworkRid)"
+      PackageVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
+      RelativeLayoutPath="packs/%(PackageName)/%(PackageVersion)" />
+
     <BundledLayoutPackage Include="Microsoft.DotNet.ILCompiler"
       Condition="'$(BundleNativeAotCompiler)' == 'true'"
       PackageName="Microsoft.DotNet.ILCompiler"

src/Layout/redist/tools/tool_fsc.csproj

@@ -30,7 +30,8 @@
    <Target Name="_ResolvePublishNuGetPackagePdbsAndXml"
         AfterTargets="_ResolveCopyLocalAssetsForPublish">
     <PropertyGroup>
-      <FSharpCorePath Condition="'$(DotNetFinalVersionKind)'!='release'">Shipping</FSharpCorePath>
+      <FSharpCorePath Condition="'$(DotNetFinalVersionKind)'==''">Shipping</FSharpCorePath>
+      <FSharpCorePath Condition="'$(DotNetFinalVersionKind)'=='prerelease'">PreRelease</FSharpCorePath>
       <FSharpCorePath Condition="'$(DotNetFinalVersionKind)'=='release'">Release</FSharpCorePath>
       <FSharpTfm>net9.0</FSharpTfm>
       <FSharpTfm Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildFromVMR)' == 'true'">$(NetCurrent)</FSharpTfm>

src/RazorSdk/Tool/TagHelperDescriptorJsonConverter.cs

@@ -170,9 +170,6 @@ private static void WriteBoundAttribute(JsonWriter writer, BoundAttributeDescrip
     {
         writer.WriteStartObject();
 
-        writer.WritePropertyName(nameof(BoundAttributeDescriptor.Kind));
-        writer.WriteValue(boundAttribute.Kind);
-
         writer.WritePropertyName(nameof(BoundAttributeDescriptor.Name));
         writer.WriteValue(boundAttribute.Name);
 
@@ -239,10 +236,13 @@ private static void WriteBoundAttributeParameter(JsonWriter writer, BoundAttribu
         writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Name));
         writer.WriteValue(boundAttributeParameter.Name);
 
+        writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.PropertyName));
+        writer.WriteValue(boundAttributeParameter.PropertyName);
+
         writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.TypeName));
         writer.WriteValue(boundAttributeParameter.TypeName);
 
-        if (boundAttributeParameter.IsEnum != default)
+        if (boundAttributeParameter.IsEnum)
         {
             writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.IsEnum));
             writer.WriteValue(boundAttributeParameter.IsEnum);
@@ -260,9 +260,6 @@ private static void WriteBoundAttributeParameter(JsonWriter writer, BoundAttribu
             serializer.Serialize(writer, boundAttributeParameter.Diagnostics);
         }
 
-        writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Metadata));
-        WriteMetadata(writer, boundAttributeParameter.Metadata);
-
         writer.WriteEndObject();
     }
 
@@ -347,12 +344,6 @@ private static void WriteRequiredAttribute(JsonWriter writer, RequiredAttributeD
             serializer.Serialize(writer, requiredAttribute.Diagnostics);
         }
 
-        if (requiredAttribute.Metadata != null && requiredAttribute.Metadata.Count > 0)
-        {
-            writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Metadata));
-            WriteMetadata(writer, requiredAttribute.Metadata);
-        }
-
         writer.WriteEndObject();
     }
 
@@ -495,9 +486,9 @@ private static void ReadBoundAttributeParameter(JsonReader reader, BoundAttribut
 
         builder.BindAttributeParameter(parameter =>
         {
-            reader.ReadProperties(propertyName =>
+            reader.ReadProperties(jsonPropertyName =>
             {
-                switch (propertyName)
+                switch (jsonPropertyName)
                 {
                     case nameof(BoundAttributeParameterDescriptor.Name):
                         if (reader.Read())
@@ -506,6 +497,13 @@ private static void ReadBoundAttributeParameter(JsonReader reader, BoundAttribut
                             parameter.Name = name;
                         }
                         break;
+                    case nameof(BoundAttributeParameterDescriptor.PropertyName):
+                        if (reader.Read())
+                        {
+                            var propertyName = (string)reader.Value;
+                            parameter.PropertyName = propertyName;
+                        }
+                        break;
                     case nameof(BoundAttributeParameterDescriptor.TypeName):
                         if (reader.Read())
                         {
@@ -527,9 +525,6 @@ private static void ReadBoundAttributeParameter(JsonReader reader, BoundAttribut
                             parameter.SetDocumentation(documentation);
                         }
                         break;
-                    case nameof(BoundAttributeParameterDescriptor.Metadata):
-                        ReadMetadata(reader, parameter.Metadata);
-                        break;
                     case nameof(BoundAttributeParameterDescriptor.Diagnostics):
                         ReadDiagnostics(reader, parameter.Diagnostics);
                         break;
@@ -646,8 +641,8 @@ private static void ReadRequiredAttribute(JsonReader reader, TagMatchingRuleDesc
                         }
                         break;
                     case nameof(RequiredAttributeDescriptor.NameComparison):
-                        var nameComparison = (RequiredAttributeDescriptor.NameComparisonMode)reader.ReadAsInt32();
-                        attribute.NameComparisonMode = nameComparison;
+                        var nameComparison = (RequiredAttributeNameComparison)reader.ReadAsInt32();
+                        attribute.NameComparison = nameComparison;
                         break;
                     case nameof(RequiredAttributeDescriptor.Value):
                         if (reader.Read())
@@ -657,15 +652,12 @@ private static void ReadRequiredAttribute(JsonReader reader, TagMatchingRuleDesc
                         }
                         break;
                     case nameof(RequiredAttributeDescriptor.ValueComparison):
-                        var valueComparison = (RequiredAttributeDescriptor.ValueComparisonMode)reader.ReadAsInt32();
-                        attribute.ValueComparisonMode = valueComparison;
+                        var valueComparison = (RequiredAttributeValueComparison)reader.ReadAsInt32();
+                        attribute.ValueComparison = valueComparison;
                         break;
                     case nameof(RequiredAttributeDescriptor.Diagnostics):
                         ReadDiagnostics(reader, attribute.Diagnostics);
                         break;
-                    case nameof(RequiredAttributeDescriptor.Metadata):
-                        ReadMetadata(reader, attribute.Metadata);
-                        break;
                 }
             });
         });

src/Workloads/Manifests/Microsoft.NET.Workload.Emscripten.Current.Manifest/Microsoft.NET.Workload.Emscripten.Current.Manifest.proj

@@ -18,7 +18,7 @@
     <ItemGroup>
       <_WorkloadManifestValues Include="NetVersion" Value="net10" />
       <_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
-      <_WorkloadManifestValues Include="EmsdkVersion" Value="$(MicrosoftNETRuntimeEmscriptenSdkInternalVersion)" />
+      <_WorkloadManifestValues Include="EmsdkVersion" Value="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
       <_WorkloadManifestValues Include="EmscriptenVersion" Value="$(EmscriptenVersionCurrent)" />
     </ItemGroup>