Revert "[release/9.0.1xx] Updates for ASPNET GA branding (#25348)"

This reverts commit 6e039af. # Conflicts: # NuGet.config # eng/Version.Details.xml # eng/Versions.props
dotnet · Oct 25, 2024 · 9ee0ec5 · 9ee0ec5
1 parent 4bb47d4
commit 9ee0ec5
Show file tree

Hide file tree

Showing 11 changed files with 177 additions and 214 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -21,7 +21,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "9.0.0-prerelease.24517.2",
+      "version": "9.0.0-prerelease.24510.3",
       "commands": [
         "xharness"
       ]

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -210,8 +210,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DotNetTempDirectory>$(RepoRoot)temp/</DotNetTempDirectory>
-    <DotNetDirectory>$(RepoRoot).dotnet/</DotNetDirectory>
+    <DotNetTempDirectory>$(RepoRoot)/temp/</DotNetTempDirectory>
+    <DotNetDirectory>$(RepoRoot)/.dotnet/</DotNetDirectory>
     <DotNetToolPath>$(DotNetDirectory)dotnet</DotNetToolPath>
     <DotNetPacksDirectory>$(DotNetDirectory)packs/</DotNetPacksDirectory>
     <DotNetLibraryPacksDirectory>$(DotNetDirectory)library-packs/</DotNetLibraryPacksDirectory>

diff --git a/NuGet.config b/NuGet.config
@@ -4,26 +4,6 @@
   <!-- `clear` ensures no additional sources are inherited from another config file. -->
   <packageSources>
     <clear />
-    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <!--  Begin: Package sources from dotnet-android -->
-    <add key="darc-pub-dotnet-android-278e101" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-278e1016/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-android -->
-    <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-8543570" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-85435709/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-aspnetcore -->
-    <!--  Begin: Package sources from dotnet-emsdk -->
-    <add key="darc-pub-dotnet-emsdk-5054dd3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5054dd35/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-5054dd3-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5054dd35-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-5054dd3-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5054dd35-1/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-emsdk -->
-    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-9c52987" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9c529879/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-9c52987-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9c529879-1/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-runtime -->
-    <!--  Begin: Package sources from xamarin-xamarin-macios -->
-    <add key="darc-pub-xamarin-xamarin-macios-ad7db64" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-ad7db649/nuget/v3/index.json" />
-    <!--  End: Package sources from xamarin-xamarin-macios -->
-    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="local" value="LOCAL_PLACEHOLDER" />
     <add key="nuget-only" value="NUGET_ONLY_PLACEHOLDER" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" protocolVersion="3" />
@@ -35,31 +15,25 @@
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
     <add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-5054dd3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5054dd35/nuget/v3/index.json" />
+
     <!-- Added manually for dotnet/runtime 8.0.11 -->
     <add key="darc-pub-dotnet-emsdk-91b783e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-runtime-ef07c4f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ef07c4f2/nuget/v3/index.json" />
+
     <!-- Added manually for .NET 8 Android -->
-    <add key="darc-pub-dotnet-android-df9aaf2-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-df9aaf29-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-android-45bb7f3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-45bb7f36/nuget/v3/index.json" />
     <!-- Added manually for .NET 8 iOS -->
-    <add key="darc-pub-xamarin-xamarin-macios-8354d6d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-8354d6d9/nuget/v3/index.json" />
+    <add key="darc-pub-xamarin-xamarin-macios-a8d7eab" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-a8d7eab2/nuget/v3/index.json" />
+
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
     <add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
-    <!-- <add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" /> -->
+
+    <!-- <add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" /> --> 
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
   </activePackageSource>
   <disabledPackageSources>
-    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-8543570" value="true" />
-    <!--  End: Package sources from dotnet-aspnetcore -->
-    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-9c52987-1" value="true" />
-    <add key="darc-int-dotnet-runtime-9c52987" value="true" />
-    <!--  End: Package sources from dotnet-runtime -->
-    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="local" value="true" />
     <add key="nuget-only" value="true" />
   </disabledPackageSources>