Merge remote-tracking branch 'origin/release/6.0.1xx-rc1' into merge-release/6.0.1xx-with-rc1

NuGet.config

@@ -15,8 +15,6 @@
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
     <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
-    <!-- Temporary feed for Xamarin workload manifest -->
-    <add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources />
 </configuration>

eng/common/tools.ps1

@@ -154,6 +154,9 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
     return $global:_DotNetInstallDir
   }
 
+  # In case of network error, try to log the current IP for reference
+  Try-LogClientIpAddress
+
   # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
   $env:DOTNET_MULTILEVEL_LOOKUP=0
 

src/finalizer/finalizer.cpp

@@ -317,7 +317,7 @@ int wmain(int argc, wchar_t* argv[])
     hr = ::DetectSdk(sczFeatureBandVersion, argv[3], &bSdkFeatureBandInstalled);
     ExitOnFailure(hr, "Failed to detect installed SDKs.");
 
-    if (bSdkFeatureBandInstalled)
+    if (!bSdkFeatureBandInstalled)
     {
         goto LExit;
     }

src/redist/targets/GenerateBundledVersions.targets

@@ -25,7 +25,7 @@
   </Target>
 
   <PropertyGroup>
-      <VersionFeature21>29</VersionFeature21>
+      <VersionFeature21>30</VersionFeature21>
       <VersionFeature31>18</VersionFeature31>
       <VersionFeature50>9</VersionFeature50>
   </PropertyGroup>

src/redist/targets/GenerateDebs.targets

@@ -86,6 +86,7 @@
       <CLISdkFiles Include="$(CLISdkRoot)**/*" />
       <TemplatesFiles Include="$(TemplatesRoot)**/*" />
       <SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
+      <ManifestFiles Include="$(RedistLayoutPath)sdk-manifests/**/*" />
     </ItemGroup>
 
     <!-- Output Directories -->
@@ -230,7 +231,7 @@
       Condition=" '$(IsDebianBaseDistro)' == 'True' AND '$(DebuildPresent)'  == 'true' "
       DependsOnTargets="PrepareDotnetDebDirectories;
                         GetAspNetSharedFxInstallArgs;"
-      Inputs="@(CLISdkFiles);@(TemplatesFiles)"
+      Inputs="@(CLISdkFiles);@(TemplatesFiles);@(ManifestFiles)"
       Outputs="$(SdkDebInstallerFile)" >
       <!-- Install Shared Framework Packages -->
       <Exec Command="sudo dpkg -i $(DownloadedNetCoreAppHostPackInstallerFile)" />
@@ -259,6 +260,14 @@
         SkipUnchangedFiles="False"
         UseHardlinksIfPossible="False" />
 
+      <!-- Create layout: Workload Manifests -->
+      <Copy
+        DestinationFiles="@(ManifestFiles->'$(LayoutPackageRootDir)/sdk-manifests/%(RecursiveDir)%(Filename)%(Extension)')"
+        SourceFiles="@(ManifestFiles)"
+        OverwriteReadOnlyFiles="True"
+        SkipUnchangedFiles="False"
+        UseHardlinksIfPossible="False" />
+
       <!-- Create layout: Man Pages -->
       <Copy
         DestinationFiles="@(SdkDebManPageFiles->'$(LayoutDocsDir)/%(RecursiveDir)%(Filename)-$(Version)%(Extension)')"

src/redist/targets/GenerateRPMs.targets

@@ -34,12 +34,14 @@
     <MakeDir Directories="$(RpmLayoutSDK)"/>
     <MakeDir Directories="$(RpmLayoutDocs)"/>
     <MakeDir Directories="$(RpmLayoutTemplates)"/>
+    <MakeDir Directories="$(RpmLayoutManifestFiles)"/>
     <MakeDir Directories="$(RpmLayoutScripts)"/>
 
     <!-- Copy files to rpm layout -->
     <ItemGroup>
       <SDKFiles Include="$(InputRoot)/**/*"/>
       <DotnetNewTemplatesFiles Include="$(DotnetNewTemplatesRoot)**/*" />
+      <SDKManifestFiles Include="$(RedistLayoutPath)sdk-manifests/**/*" />
       <SDKManpages Include="$(ManPagesDir)/**/*"/>
       <SDKTemplatesFiles Include="$(TemplatesDir)/**/*"/>
       <SDKScriptsFiles Include="$(ScriptsDir)/after_remove_host.sh"/>
@@ -57,6 +59,12 @@
           SkipUnchangedFiles="False"
           UseHardlinksIfPossible="False"/>
 
+    <Copy SourceFiles="@(SDKManifestFiles)"
+          DestinationFiles="@(SDKManifestFiles->'$(RpmLayoutManifestFiles)/%(RecursiveDir)%(Filename)%(Extension)')"
+          OverwriteReadOnlyFiles="True"
+          SkipUnchangedFiles="False"
+          UseHardlinksIfPossible="False"/>
+
     <Copy SourceFiles="@(SDKManpages)"
           DestinationFiles="@(SDKManpages->'$(RpmLayoutDocs)/%(RecursiveDir)%(Filename)%(Extension)')"
           OverwriteReadOnlyFiles="True"
@@ -198,6 +206,7 @@
       <RpmLayoutPackageRoot>$(RpmLayoutDirectory)package_root</RpmLayoutPackageRoot>
       <RpmLayoutSDK>$(RpmLayoutPackageRoot)/sdk</RpmLayoutSDK>
       <RpmLayoutDotnetNewTemplates>$(RpmLayoutPackageRoot)/templates</RpmLayoutDotnetNewTemplates>
+      <RpmLayoutManifestFiles>$(RpmLayoutPackageRoot)/sdk-manifests</RpmLayoutManifestFiles>
       <RpmLayoutDocs>$(RpmLayoutDirectory)docs</RpmLayoutDocs>                <!-- Man Pages -->
       <RpmLayoutTemplates>$(RpmLayoutDirectory)templates</RpmLayoutTemplates> <!-- Copyright, Changelog -->
       <RpmLayoutScripts>$(RpmLayoutDirectory)scripts</RpmLayoutScripts>