dotnet · joperezr · Sep 29, 2023 · Sep 28, 2023 · Sep 29, 2023
diff --git a/NuGet.config b/NuGet.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <clear />
@@ -37,6 +37,7 @@
       <package pattern="Microsoft.DotNet.Maestro.Tasks" />
       <package pattern="Microsoft.DotNet.RemoteExecutor" />
       <package pattern="Microsoft.DotNet.SignTool" />
+      <package pattern="Microsoft.DotNet.Tar" />
       <package pattern="Microsoft.DotNet.XliffTasks" />
       <package pattern="Microsoft.DotNet.XUnitExtensions" />
       <package pattern="Microsoft.Signed.Wix" />

diff --git a/build.sh b/build.sh
diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -13,17 +13,41 @@
 ## Install .NET 8 RC2
 
 1. Add the NuGet feed for .NET 8 - https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json (https://github.com/dotnet/installer#installers-and-binaries)
-2. [Install the RC2 build](https://github.com/dotnet/installer#table)
+2. Install the .NET 8 RC2 SDK version 8.0.100-rc.2.23472.8 or newer.
+   1. [Windows x64 link](https://dotnetbuilds.azureedge.net/public/Sdk/8.0.100-rc.2.23472.8/dotnet-sdk-8.0.100-rc.2.23472.8-win-x64.exe)
+   2. [Linux x64 link](https://dotnetbuilds.azureedge.net/public/Sdk/8.0.100-rc.2.23472.8/dotnet-sdk-8.0.100-rc.2.23472.8-linux-x64.tar.gz)
+   3. [OSX x64 link](https://dotnetbuilds.azureedge.net/public/Sdk/8.0.100-rc.2.23472.8/dotnet-sdk-8.0.100-rc.2.23472.8-osx-x64.tar.gz)
 
 ## Install Docker Desktop
 
 1. https://www.docker.com/
 
-## Download DCP application orchestrator
+## Install the Aspire dotnet workload
 
-1. [Download the orchestrator from here](https://microsoft-my.sharepoint.com/:f:/p/karolz/EoSAlHwu_OVDn3dBWW2D7hUBWOBzON4CeetcWOjiVW4JaQ?e=r5Bqzs)
-2. Unzip it into your user profile folder (typically `c:\Users\<your user name>` on Windows). The result should be that you have a ".dcp" folder in your profile, with dcp.exe inside.
-    - (and yes, we are working on a better setup story).
+1. The RC2 SDK is aware that the Aspire workload exists, but the real manifest is not installed by default. In order to install it, you'll need to update the workload in a directory that has a NuGet.config[^3] with the right feeds configured[^2] so that it can pull the latest manifest. Once you have created the NuGet.config file in your working directory, then you need to run the following command[^1]:
+
+   ```shell
+    dotnet workload update --skip-sign-check --interactive
+   ```
+
+2. The above command will update the Aspire manifest in your RC2 build, meaning it will already be setup for command-line (VS support is coming soon) In-product acquisition (IPA) of the Aspire workload. In order to manually install the workload, you can run the following command[^1]:
+
+   ```shell
+    dotnet workload install aspire --skip-sign-check --interactive
+   ```
+
+[^1]: The `--skip-sign-check` flag is required because the packages we build out of the Aspire repo are not yet signed.
+[^2]: If you want to create a separate NuGet.config instead, these are the contents you need:
+      ```xml
+      <?xml version="1.0" encoding="utf-8"?>
+      <configuration>
+      <packageSources>
+          <clear />
+          <add key="dotnet-tools-internal" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json" />
+      </packageSources>
+      </configuration>
+      ```
+[^3]: If you don't want to create a NuGet.config file, you should also be able to run the `update` and `install` commands using the following extra argument: `--source https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json`.
 
 # Create a new Project
 
@@ -43,6 +67,22 @@ return await app.RunAsync();
 
 4. Look in the Terminal window to see which port the application is running on
 
+# Create a new Project from the command line using workload templates
+
+- To create an empty Aspire project[^3], run the following command::
+
+```shell
+    dotnet new aspire
+```
+
+- To create an Aspire project using the Starter template, run the following command:
+
+```shell
+    dotnet new aspire-starter
+```
+
+[^3]: In order for these commands to work, you must have already installed the Aspire workload by following the steps in #Install-the-Aspire-dotnet-workload section.
+
 # Run the Aspire eShopLite sample
 
 ## Enable Azure ServiceBus (optional)

diff --git a/dotnet.sh b/dotnet.sh
diff --git a/eng/Build.props b/eng/Build.props
@@ -7,6 +7,5 @@
     <ProjectToBuild Include="$(RepoRoot)src\**\*.csproj" Exclude="$(RepoRoot)src\Aspire.ProjectTemplates\templates\**\*.csproj" />
     <ProjectToBuild Include="$(RepoRoot)tests\**\*.csproj"  />
     <ProjectToBuild Include="$(RepoRoot)samples\**\*.csproj" />
-    <ProjectToBuild Include="$(RepoRoot)src\**\*.sfxproj" />
   </ItemGroup>
 </Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,34 +3,34 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23451.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
+      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23451.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23463.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
+      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23451.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23463.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
+      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23451.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23463.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
+      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23451.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23463.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
+      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23451.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23463.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
+      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23451.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23463.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4665b3d04e1da3796b965c3c3e3b97f55c449a6e</Sha>
+      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -11,12 +11,12 @@
   <PropertyGroup>
     <!-- Package versions defined directly in <reporoot>/Directory.Packages.props -->
     <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.1.23422.1</MicrosoftDotnetSdkInternalPackageVersion>
-    <_DcpVersion>0.1.29-rc.3</_DcpVersion>
+    <_DcpVersion>0.1.30-rc.4</_DcpVersion>
     <MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23419.3</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftmacOSSdkPackageVersion>13.3.8825-net8-rc1</MicrosoftmacOSSdkPackageVersion>
-    <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23371.1</MicrosoftDotNetBuildTasksPackagingVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23371.1</MicrosoftDotNetBuildTasksTemplatingVersion>
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23371.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
-    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23371.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
+    <MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23463.1</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23463.1</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23463.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23463.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/eng/build.sh b/eng/build.sh
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
diff --git a/eng/common/build.sh b/eng/common/build.sh
diff --git a/eng/common/cibuild.sh b/eng/common/cibuild.sh
diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh
diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh
diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh
diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh
diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh
diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh
diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh
diff --git a/eng/common/msbuild.sh b/eng/common/msbuild.sh
diff --git a/eng/common/native/common-library.sh b/eng/common/native/common-library.sh
diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh
diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh
diff --git a/eng/common/native/init-os-and-arch.sh b/eng/common/native/init-os-and-arch.sh
diff --git a/eng/common/native/install-cmake-test.sh b/eng/common/native/install-cmake-test.sh
diff --git a/eng/common/native/install-cmake.sh b/eng/common/native/install-cmake.sh
diff --git a/eng/common/pipeline-logging-functions.sh b/eng/common/pipeline-logging-functions.sh
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
diff --git a/eng/dcppack/Aspire.Hosting.Orchestration.props b/eng/dcppack/Aspire.Hosting.Orchestration.props
@@ -0,0 +1,2 @@
+<Project>
+</Project>
diff --git a/eng/dcppack/Aspire.Hosting.Orchestration.targets b/eng/dcppack/Aspire.Hosting.Orchestration.targets
@@ -0,0 +1,11 @@
+<Project>
+
+  <PropertyGroup>
+    <DcpDir Condition=" '$(DcpDir)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..', 'tools'))</DcpDir>
+    <DcpExtensionsPath Condition=" '$(DcpExtensionsPath)' == '' ">$([MSBuild]::NormalizePath($(DcpDir), 'ext'))</DcpExtensionsPath>
+    <DcpBinPath Condition=" '$(DcpBinPath)' == '' ">$([MSBuild]::NormalizePath($(DcpExtensionsPath), 'bin'))</DcpBinPath>
+    <DcpCliPath Condition=" '$(DcpCliPath)'  == '' ">$([MSBuild]::NormalizePath($(DcpDir), 'dcp'))</DcpCliPath>
+    <DcpCliPath Condition=" '$(OS)' == 'Windows_NT' and !$(DcpCliPath.EndsWith('.exe')) ">$(DcpCliPath).exe</DcpCliPath>
+  </PropertyGroup>
+
+</Project>
diff --git a/eng/dcppack/Sdk.in.targets b/eng/dcppack/Sdk.in.targets
@@ -0,0 +1,5 @@
+<Project>
+
+    <Import Project="$(MSBuildThisFileDirectory)../build/Aspire.Hosting.Orchestration.@[email protected]" />
+
+</Project>
diff --git a/eng/dcppack/Sdk.props b/eng/dcppack/Sdk.props
@@ -0,0 +1,2 @@
+<Project>
+</Project>
diff --git a/eng/dcppack/UnixFilePermissions.xml b/eng/dcppack/UnixFilePermissions.xml
@@ -0,0 +1,6 @@
+<FileList>
+  <File Path="tools/dcp" Permission="755"/>
+  <File Path="tools/ext/bin/traefik" Permission="755"/>
+  <File Path="tools/ext/dcpd" Permission="755"/>
+  <File Path="tools/ext/dcpctrl" Permission="755"/>
+</FileList>
diff --git a/eng/dcppack/dcppack.csproj b/eng/dcppack/dcppack.csproj
@@ -0,0 +1,56 @@
+<Project>
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+
+  <Import Project="../../src/Shared/Workload.targets" />
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <IsPackable>true</IsPackable>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <PackageOutputPath Condition=" '$(PackageOutputPath)' == '' ">$(ArtifactsShippingPackagesDir)</PackageOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DcpRuntime Condition=" '$(DcpRuntime)' == '' ">win-x64</DcpRuntime>
+    <DcpPlatform Condition=" '$(DcpPlatform)' == '' ">$([System.String]::Copy('$(DcpRuntime)').Replace('win-', 'windows-').Replace('osx-', 'darwin-').Replace('-x86', '-386').Replace('-x64', '-amd64'))</DcpPlatform>
+    <DcpPlatformType Condition=" '$(DcpPlatformType)' == '' and $(DcpPlatform.StartsWith('windows-')) ">Windows</DcpPlatformType>
+    <DcpPlatformType Condition=" '$(DcpPlatformType)' == '' ">Unix</DcpPlatformType>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <PackageId>Aspire.Hosting.Orchestration.$(DcpRuntime)</PackageId>
+    <Description>.NET Aspire Orchestration Dependencies</Description>
+  </PropertyGroup>
+
+  <!-- Package downloads to DCP packages as we need to repack the binaries from them -->
+  <ItemGroup>
+    <PackageDownload Include="Microsoft.DeveloperControlPlane.darwin-amd64" Version="[$(_DcpVersion)]" />
+    <PackageDownload Include="Microsoft.DeveloperControlPlane.darwin-arm64" Version="[$(_DcpVersion)]" />
+    <PackageDownload Include="Microsoft.DeveloperControlPlane.linux-amd64" Version="[$(_DcpVersion)]" />
+    <PackageDownload Include="Microsoft.DeveloperControlPlane.linux-arm64" Version="[$(_DcpVersion)]" />
+    <PackageDownload Include="Microsoft.DeveloperControlPlane.windows-386" Version="[$(_DcpVersion)]" />
+    <PackageDownload Include="Microsoft.DeveloperControlPlane.windows-amd64" Version="[$(_DcpVersion)]" />
+    <PackageDownload Include="Microsoft.DeveloperControlPlane.windows-arm64" Version="[$(_DcpVersion)]" />
+  </ItemGroup>
+
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+
+  <Target Name="Build" />
+
+  <ItemGroup>
+    <None Include="$(NuGetPackageRoot)Microsoft.DeveloperControlPlane.$(DcpPlatform)/$(_DcpVersion)/NOTICE" Pack="true" PackagePath="/" />
+    <None Include="$(NuGetPackageRoot)Microsoft.DeveloperControlPlane.$(DcpPlatform)/$(_DcpVersion)/tools/**/*" Pack="true" PackagePath="tools/" />
+    <None Include="Sdk.props" Pack="true" PackagePath="sdk/" />
+    <None Include="Sdk.in.targets" PerformTextReplacement="True" Pack="true" PackagePath="sdk/" />
+    <None Include="Aspire.Hosting.Orchestration.props" pack="true" PackagePath="build/$(PackageId).props" />
+    <None Include="Aspire.Hosting.Orchestration.targets" pack="true" PackagePath="build/$(PackageId).targets" />
+    <None Include="UnixFilePermissions.xml" Pack="true" PackagePath="data/" Condition=" '$(DcpPlatformType)' == 'Unix' " />
+  </ItemGroup>
+
+  <ItemGroup>
+    <TextReplacementValue Include="RUNTIME" NewValue="$(DcpRuntime)" />
+  </ItemGroup>
+
+</Project>
diff --git a/eng/workloads/workloads.csproj b/eng/workloads/workloads.csproj
@@ -36,16 +36,16 @@
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" GeneratePathProperty="true" />
   </ItemGroup>
 
-  <!-- Package downloads to DCP packages as they will need to get passed to the Arcade task for MSI generation -->
+  <!-- The list of runtimes DCP provides binaries for -->
   <ItemGroup>
-    <PackageDownload Include="Microsoft.DeveloperControlPlane.darwin-amd64" Version="[$(_DcpVersion)]" />
-    <PackageDownload Include="Microsoft.DeveloperControlPlane.darwin-arm64" Version="[$(_DcpVersion)]" />
-    <PackageDownload Include="Microsoft.DeveloperControlPlane.linux-amd64" Version="[$(_DcpVersion)]" />
-    <PackageDownload Include="Microsoft.DeveloperControlPlane.linux-arm64" Version="[$(_DcpVersion)]" />
-    <PackageDownload Include="Microsoft.DeveloperControlPlane.windows-386" Version="[$(_DcpVersion)]" />
-    <PackageDownload Include="Microsoft.DeveloperControlPlane.windows-amd64" Version="[$(_DcpVersion)]" />
-    <PackageDownload Include="Microsoft.DeveloperControlPlane.windows-arm64" Version="[$(_DcpVersion)]" />
-  </ItemGroup>
+      <_DcpRuntimes Include="win-x86" />
+      <_DcpRuntimes Include="win-x64" />
+      <_DcpRuntimes Include="win-arm64" />
+      <_DcpRuntimes Include="linux-x64" />
+      <_DcpRuntimes Include="linux-arm64" />
+      <_DcpRuntimes Include="osx-x64" />
+      <_DcpRuntimes Include="osx-arm64" />
+    </ItemGroup>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
 
@@ -73,13 +73,7 @@
       </ShortNames>
     </ItemGroup>
 
-    <!-- Copy DCP packages to Package Source -->
-    <ItemGroup>
-      <_DCPPackagesToCopy Include="$(NuGetPackageRoot)Microsoft.DeveloperControlPlane*\$(_DcpVersion)\*.nupkg" />
-    </ItemGroup>
-
-    <!-- Temporarily copying the dcp packages into the package source folder so that the Arcade task can find them and use them to generate the MSIs. -->
-    <Copy SourceFiles="@(_DCPPackagesToCopy)" DestinationFolder="$(PackageSource)" />
+    <MSBuild Projects="../dcppack/dcppack.csproj" Targets="restore;build" Properties="DcpRuntime=%(_DcpRuntimes.Identity);PackageOutputPath=$(PackageSource)" />
 
     <ItemGroup>
       <ManifestPackages Include="$(PackageSource)Microsoft.NET.Sdk.Aspire.Manifest*.nupkg"
@@ -101,9 +95,6 @@
       <Output TaskParameter="Msis" ItemName="Msis" />
     </CreateVisualStudioWorkload>
 
-    <!-- Delete the DCP packages from the package source folder After the right Swix Packs were produced. -->
-    <Delete Files="$(PackageSource)%(_DCPPackagesToCopy.Filename).nupkg" />
-
     <!-- Split SWIX projects for packs and components/manifests and build them into separate folders. This allows us to consume pack-only drops
          across multiple VS builds to support multi-targeting. -->
     <ItemGroup>

diff --git a/global.json b/global.json
@@ -8,8 +8,8 @@
     "dotnet": "8.0.100-rc.2.23466.1"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23451.1",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23451.1",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23463.1",
     "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23463.1",
     "Microsoft.Build.NoTargets": "3.7.0"
   }

diff --git a/samples/BasketService/Program.cs b/samples/BasketService/Program.cs
@@ -5,7 +5,7 @@
 builder.AddServiceDefaults();
 builder.Services.AddGrpc();
 
-builder.AddRedis();
+builder.AddRedis("basketCache");
 builder.Services.AddTransient<IBasketRepository, RedisBasketRepository>();
 
 // When running for Development, don't fail at startup if the developer hasn't configured ServiceBus yet.

diff --git a/samples/DevHost/Program.cs b/samples/DevHost/Program.cs
@@ -10,7 +10,7 @@
        .WithServiceBinding(containerPort: 3000, name: "grafana-http", scheme: "http");
 
 var postgres = builder.AddPostgresContainer("postgres");
-var redis = builder.AddRedisContainer("redis");
+var redis = builder.AddRedisContainer("basketCache");
 var sql = builder.AddSqlServerContainer("sql");
 
 var catalog = builder.AddProject<Projects.CatalogService>()

diff --git a/samples/MyFrontend/Program.cs b/samples/MyFrontend/Program.cs
@@ -24,6 +24,8 @@
 
 app.UseStaticFiles();
 
+app.UseAntiforgery();
+
 app.MapRazorComponents<App>();
 
 app.MapGet("/admin", (IConfiguration config) =>

diff --git a/src/Aspire.Dashboard/Components/App.razor b/src/Aspire.Dashboard/Components/App.razor
@@ -13,7 +13,7 @@
     <HeadOutlet @rendermode="@RenderMode.InteractiveServer" />
 </head>
 
-<body>
+<body class="before-upgrade">
     <Routes @rendermode="@RenderMode.InteractiveServer" />
     <script src="_framework/blazor.web.js" suppress-error="BL9992"></script>
     <script src="_content/Aspire.Dashboard/js/app.js"></script>