Skip to content

Commit

Permalink
[release/9.0.1xx] Updates for ASPNET GA branding (#25348)
Browse files Browse the repository at this point in the history 
* Update GA branding

* Update arcade

* update to internal

* Update variables.yml

* Update DotNet.csproj

* Update DotNet.csproj

* Update Workloads.csproj

* Update NuGet.config

* Try this

* Update sdk , aspnet and runtime

* Update iOS and Android for ga

* Skip blazor test

* Fix Emscripten dependency

* Update NuGet.config

---------

Co-authored-by: Jonathan Peppers <[email protected]>
  • Loading branch information
@rmarinho @jonathanpeppers
rmarinho and jonathanpeppers authored Oct 22, 2024
1 parent 14f33bf commit 6e039af
Show file tree
Hide file tree
Showing 11 changed files with 217 additions and 176 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "9.0.0-prerelease.24510.3",
"version": "9.0.0-prerelease.24517.2",
"commands": [
"xharness"
]
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
42 changes: 36 additions & 6 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,27 @@
<!-- `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-b90c559" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-b90c5590/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-a351bc9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-a351bc9f/nuget/v3/index.json" />
<add key="darc-pub-xamarin-xamarin-macios-a351bc9-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-a351bc9f-1/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" />
Expand All @@ -15,25 +36,34 @@
<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-45bb7f3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-45bb7f36/nuget/v3/index.json" />
<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"/>
<!-- Added manually for .NET 8 iOS -->
<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="darc-pub-xamarin-xamarin-macios-0017e4c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-0017e4cf/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>
Expand Down
Loading

0 comments on commit 6e039af

Please sign in to comment.