Update .NET 9 RC2 to .NET 9 (#167)

Azure · Nov 13, 2024 · b5a2d3b · b5a2d3b
1 parent 74d293f
commit b5a2d3b
Show file tree

Hide file tree

Showing 24 changed files with 183 additions and 283 deletions.
diff --git a/docs/aca/00-workshop-intro/4-prerequisites.md b/docs/aca/00-workshop-intro/4-prerequisites.md
@@ -22,6 +22,7 @@ Make sure you have your development environment set up and configured.
 1. VS Code Dapr extension. Depends on Dapr CLI - [Install](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-dapr){target=_blank}
 1. Azure CLI - [Install](https://docs.microsoft.com/cli/azure/install-azure-cli){target=_blank}
 1. Git CLI - [Install](https://git-scm.com){target=_blank}
+1. (Optional) A REST client such as [Postman](https://www.postman.com/){target=_blank} or [Insomnia](https://insomnia.rest/){target=_blank} or similar.
 
 ## Set up Git Repository & Variable Scripts
 
@@ -82,17 +83,17 @@ This workshop typically spans several days. As such, you may close your tools, e
 
 - Copy the [Set-Variables.ps1 script](../../aca/30-appendix/03-variables.md){target=_blank} into the newly-created `Set-Variables.ps1` file and save it.
 
-- Execute the script. You will do this repeatedly throughout the modules. The output of the script will inform you how many variables are written out. As we have not yet defined any variables, the output will indicate that the script has exited. This is intentional and expected at this stage.
+- Execute the script. You will do this repeatedly throughout the modules. The output of the script will inform you how many variables are written out. As we have not yet defined any variables, the output will indicate that the script has exited (without writing out to the file). This is intentional and expected at this stage.
 
     ```shell
     .\Set-Variables.ps1
     ```
 
-- Perform an initial commit of the variables file.
+- Commit the `Set-Variables.ps1` file.
 
     ```shell
-    git add .\Variables.ps1
-    git commit -m "Initialize Variables.ps1"
+    git add .\Set-Variables.ps1
+    git commit -m "Add Set-Variables.ps1"
     ```
 
 This completes the basic setup for Git and the variables to be used. You are ready to proceed to [Module 1](../01-deploy-api-to-aca/index.md)!

diff --git a/docs/aca/01-deploy-api-to-aca/global-dotnet9.json b/docs/aca/01-deploy-api-to-aca/global-dotnet9.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "9.0.100-rc.2.24474.11",
+        "version": "9.0.100",
         "rollForward": "latestFeature"
     }
 }
diff --git a/docs/aca/04-aca-dapr-stateapi/Backend.Api-dotnet9.csproj b/docs/aca/04-aca-dapr-stateapi/Backend.Api-dotnet9.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dapr.AspNetCore" Version="1.14.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0-rc.2.24474.3" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/docs/aca/04-aca-dapr-stateapi/index.md b/docs/aca/04-aca-dapr-stateapi/index.md
@@ -302,7 +302,6 @@ To add the component file state store, add a new folder named **components** und
     Dapr component scopes correspond to the Dapr application ID of a container app, not the container app name.
 
 Now you should be ready to launch both applications and start doing CRUD operations from the Frontend Web App including querying the store. All your data will be stored in Cosmos DB Database you just provisioned.
-**TODO: Add instructions to run both again.**
 
 If you have been running the different microservices using the [debug and launch Dapr applications in VSCode](../30-appendix/01-run-debug-dapr-app-vscode.md) then remember to uncomment the following line inside tasks.json file.
 This will instruct dapr to load the local projects components located at **./components** instead of the global components' folder.

diff --git a/docs/aca/05-aca-dapr-pubsubapi/Backend.Svc-dotnet9.csproj b/docs/aca/05-aca-dapr-pubsubapi/Backend.Svc-dotnet9.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dapr.AspNetCore" Version="1.14.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0-rc.2.24474.3" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/docs/aca/08-aca-monitoring/Backend.Api-dotnet9.csproj b/docs/aca/08-aca-monitoring/Backend.Api-dotnet9.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Dapr.AspNetCore" Version="1.14.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0-rc.2.24474.3" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
   </ItemGroup>
 
 </Project>

diff --git a/docs/aca/08-aca-monitoring/Backend.Svc-dotnet9.csproj b/docs/aca/08-aca-monitoring/Backend.Svc-dotnet9.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Dapr.AspNetCore" Version="1.14.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0-rc.2.24474.3" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/docs/aca/08-aca-monitoring/index.md b/docs/aca/08-aca-monitoring/index.md
@@ -75,13 +75,13 @@ To incorporate the SDK, use the NuGet reference below in the `csproj` file of th
 
     === "TasksTracker.TasksManager.Backend.Api.csproj"
 
-        ```xml hl_lines="12"
+        ```xml hl_lines="11"
         --8<-- "docs/aca/08-aca-monitoring/Backend.Api-dotnet9.csproj"
         ```
 
     === "TasksTracker.TasksManager.Backend.Svc.csproj"
 
-        ```xml hl_lines="12"
+        ```xml hl_lines="11"
         --8<-- "docs/aca/08-aca-monitoring/Backend.Svc-dotnet9.csproj"
         ```
 

diff --git a/docs/aca/12-optimize-containers/Backend.Api.Dockerfile.chiseled b/docs/aca/12-optimize-containers/Backend.Api.Dockerfile.chiseled
@@ -5,20 +5,11 @@ EXPOSE 8080
 ENV ASPNETCORE_URLS=http://+:8080
 
 USER app
-FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build
-ARG configuration=Release
+FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS publish
 WORKDIR /src
-COPY ["TasksTracker.TasksManager.Backend.Api/TasksTracker.TasksManager.Backend.Api.csproj", "TasksTracker.TasksManager.Backend.Api/"]
-RUN dotnet restore "TasksTracker.TasksManager.Backend.Api/TasksTracker.TasksManager.Backend.Api.csproj"
 COPY . .
-WORKDIR "/src/TasksTracker.TasksManager.Backend.Api"
-RUN dotnet build "TasksTracker.TasksManager.Backend.Api.csproj" -c $configuration -o /app/build
-
-FROM build AS publish
-ARG configuration=Release
-RUN dotnet publish "TasksTracker.TasksManager.Backend.Api.csproj" -c $configuration -o /app/publish /p:UseAppHost=false
+RUN dotnet publish -o /app/publish
 
 FROM base AS final
-WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "TasksTracker.TasksManager.Backend.Api.dll"]
+ENTRYPOINT ["dotnet", "TasksTracker.TasksManager.Backend.Api.dll"]
diff --git a/docs/aca/12-optimize-containers/Backend.Api.Dockerfile.chiseled.aot b/docs/aca/12-optimize-containers/Backend.Api.Dockerfile.chiseled.aot
diff --git a/docs/aca/12-optimize-containers/Backend.Api.Dockerfile.concise b/docs/aca/12-optimize-containers/Backend.Api.Dockerfile.concise
@@ -0,0 +1,15 @@
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+WORKDIR /app
+EXPOSE 8080
+
+ENV ASPNETCORE_URLS=http://+:8080
+
+USER app
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS publish
+WORKDIR /src
+COPY . .
+RUN dotnet publish -o /app/publish
+
+FROM base AS final
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "TasksTracker.TasksManager.Backend.Api.dll"]
diff --git a/docs/aca/12-optimize-containers/Backend.Svc.Dockerfile.chiseled b/docs/aca/12-optimize-containers/Backend.Svc.Dockerfile.chiseled
@@ -0,0 +1,15 @@
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled AS base
+WORKDIR /app
+EXPOSE 8080
+
+ENV ASPNETCORE_URLS=http://+:8080
+
+USER app
+FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS publish
+WORKDIR /src
+COPY . .
+RUN dotnet publish -o /app/publish
+
+FROM base AS final
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "TasksTracker.Processor.Backend.Svc.dll"]
diff --git a/docs/aca/12-optimize-containers/Backend.Svc.Dockerfile.chiseled.aot b/docs/aca/12-optimize-containers/Backend.Svc.Dockerfile.chiseled.aot
diff --git a/docs/aca/12-optimize-containers/Backend.Svc.Dockerfile.concise b/docs/aca/12-optimize-containers/Backend.Svc.Dockerfile.concise
@@ -0,0 +1,15 @@
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+WORKDIR /app
+EXPOSE 8080
+
+ENV ASPNETCORE_URLS=http://+:8080
+
+USER app
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS publish
+WORKDIR /src
+COPY . .
+RUN dotnet publish -o /app/publish
+
+FROM base AS final
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "TasksTracker.Processor.Backend.Svc.dll"]
diff --git a/docs/aca/12-optimize-containers/Frontend.Ui.Dockerfile.chiseled b/docs/aca/12-optimize-containers/Frontend.Ui.Dockerfile.chiseled
@@ -0,0 +1,15 @@
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled AS base
+WORKDIR /app
+EXPOSE 8080
+
+ENV ASPNETCORE_URLS=http://+:8080
+
+USER app
+FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS publish
+WORKDIR /src
+COPY . .
+RUN dotnet publish -o /app/publish
+
+FROM base AS final
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "TasksTracker.WebPortal.Frontend.Ui.dll"]
diff --git a/docs/aca/12-optimize-containers/Frontend.Ui.Dockerfile.chiseled.aot b/docs/aca/12-optimize-containers/Frontend.Ui.Dockerfile.chiseled.aot
diff --git a/docs/aca/12-optimize-containers/Frontend.Ui.Dockerfile.concise b/docs/aca/12-optimize-containers/Frontend.Ui.Dockerfile.concise
@@ -0,0 +1,15 @@
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+WORKDIR /app
+EXPOSE 8080
+
+ENV ASPNETCORE_URLS=http://+:8080
+
+USER app
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS publish
+WORKDIR /src
+COPY . .
+RUN dotnet publish -o /app/publish
+
+FROM base AS final
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "TasksTracker.WebPortal.Frontend.Ui.dll"]