Skip to content

Commit 2c9c32b

Browse files
codebytescodebytes
authored
Merge pull request #24 from codebytes/net9
Net9
2 parents fc5bd04 + 2d57110 commit 2c9c32b

File tree

102 files changed

+62944
-265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+62944
-265
lines changed

‎.devcontainer/dotnet/devcontainer.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
{
44
"name": "C# (.NET)",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/dotnet:1-8.0-bookworm",
6+
"image": "mcr.microsoft.com/devcontainers/dotnet:1-9.0-bookworm",
77
// Features to add to the dev container. More info: https://containers.dev/features.
88
"features": {
9-
"ghcr.io/devcontainers/features/azure-cli:1": {}
9+
"ghcr.io/devcontainers/features/azure-cli:1": {},
10+
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
11+
"ghcr.io/devcontainers/features/powershell:1": {}
1012
},
1113
// Use 'forwardPorts' to make a list of ports inside the container available locally.
1214
"forwardPorts": [5000, 5001],
@@ -17,7 +19,8 @@
1719
},
1820
// Use 'postCreateCommand' to run commands after the container is created.
1921
// "postCreateCommand": "dotnet restore",
20-
"postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
22+
"postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && dotnet dev-certs https --trust",
23+
"onCreateCommand": "dotnet new install Aspire.ProjectTemplates::9.1.0 --force",
2124
// Configure tool-specific properties.
2225
"customizations": {
2326
// Configure properties specific to VS Code.

‎00-basic-console-template/SampleApp.csproj renamed to ‎00-basic-console-template/BasicConsoleSample.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
8-
</PropertyGroup>
9-
10-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net9.0</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
</PropertyGroup>
9+
10+
</Project>

‎05-console-configuration-in-memory/SampleApp.csproj renamed to ‎01-console-configuration-json/ConsoleConfigurationJson.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<RootNamespace>SampleApp</RootNamespace>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎02-console-configuration-environment/SampleApp.csproj renamed to ‎02-console-configuration-environment/ConsoleConfigurationEnv.csproj

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<RootNamespace>SampleApp</RootNamespace>
7-
<ImplicitUsings>enable</ImplicitUsings>
8-
<Nullable>enable</Nullable>
9-
</PropertyGroup>
10-
11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
15-
</ItemGroup>
16-
17-
<ItemGroup>
18-
<None Update="config.json">
19-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
20-
</None>
21-
</ItemGroup>
22-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net9.0</TargetFramework>
6+
<RootNamespace>SampleApp</RootNamespace>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<None Update="config.json">
19+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
20+
</None>
21+
</ItemGroup>
22+
</Project>

‎03-console-configuration-cmdline/SampleApp.csproj renamed to ‎03-console-configuration-cmdline/ConsoleConfigurationCmd.csproj

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<RootNamespace>SampleApp</RootNamespace>
7-
<ImplicitUsings>enable</ImplicitUsings>
8-
<Nullable>enable</Nullable>
9-
</PropertyGroup>
10-
11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
16-
</ItemGroup>
17-
18-
<ItemGroup>
19-
<None Update="config.json">
20-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
21-
</None>
22-
</ItemGroup>
23-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net9.0</TargetFramework>
6+
<RootNamespace>SampleApp</RootNamespace>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.2" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<None Update="config.json">
20+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
21+
</None>
22+
</ItemGroup>
23+
</Project>

‎04-console-configuration-user-secrets/SampleApp.csproj renamed to ‎04-console-configuration-user-secrets/ConsoleConfigurationUserSecrets.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<RootNamespace>SampleApp</RootNamespace>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99
<UserSecretsId>cb8a1ac0-6552-4621-96d0-76b3e69ae17a</UserSecretsId>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.2" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎01-console-configuration-json/SampleApp.csproj renamed to ‎05-console-configuration-in-memory/ConsoleConfigurationInMem.csproj

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<RootNamespace>SampleApp</RootNamespace>
7-
<ImplicitUsings>enable</ImplicitUsings>
8-
<Nullable>enable</Nullable>
9-
</PropertyGroup>
10-
11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
14-
</ItemGroup>
15-
16-
<ItemGroup>
17-
<None Update="config.json">
18-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19-
</None>
20-
</ItemGroup>
21-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net9.0</TargetFramework>
6+
<RootNamespace>SampleApp</RootNamespace>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<None Update="config.json">
18+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19+
</None>
20+
</ItemGroup>
21+
</Project>

‎06-console-config-sections/SampleApp.csproj renamed to ‎06-console-config-sections/ConsoleConfigSections.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<RootNamespace>SampleApp</RootNamespace>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99
<UserSecretsId>9a522054-827b-4a65-8321-cb500f49dd28</UserSecretsId>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.2" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
1818
<PackageReference Include="Spectre.Console" Version="0.49.1" />
1919
</ItemGroup>
2020

‎06b-console-config-sections-cmdline-mappings/SampleApp.csproj renamed to ‎06b-console-config-sections-cmdline-mappings/ConsoleConfigSectionMappings.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<RootNamespace>SampleApp</RootNamespace>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="9.0.2" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
1717
<PackageReference Include="Spectre.Console" Version="0.49.1" />
1818
</ItemGroup>
1919

‎07-console-key-per-file/SampleApp.csproj renamed to ‎07-console-key-per-file/ConsoleConfigurationKeys.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<RootNamespace>SampleApp</RootNamespace>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99
<UserSecretsId>782d4486-cc36-408d-8b17-d299f7e6a085</UserSecretsId>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="8.0.8" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.2" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="9.0.2" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎08-console-keyvault/SampleApp.csproj renamed to ‎08-console-keyvault/ConsoleKeyvault.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>2d3ed947-36c1-4d6f-afaf-48e661f4d837</UserSecretsId>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2" />
12-
<PackageReference Include="Azure.Identity" Version="1.12.1" />
13-
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.3.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="7.3.0" />
15-
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.5.0" />
16-
<PackageReference Include="system.diagnostics.diagnosticsource" Version="8.0.1" />
11+
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
12+
<PackageReference Include="Azure.Identity" Version="1.13.2" />
13+
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.1.1" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.1.1" />
15+
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="4.0.0" />
16+
<PackageReference Include="system.diagnostics.diagnosticsource" Version="9.0.2" />
1717
</ItemGroup>
1818

1919
</Project>

‎08-console-keyvault/setup.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,9 @@ az group create --name ${rg} --location ${location}
88

99
az keyvault create --location ${location} --name ${kvName} --resource-group ${rg}
1010

11+
12+
# Assign the Key Vault Contributor role to the current user
13+
userId=$(az ad signed-in-user show --query id --output tsv)
14+
az role assignment create --assignee ${userId} --role "Key Vault Administrator" --scope /subscriptions/$(az account show --query id --output tsv)/resourceGroups/${rg}/providers/Microsoft.KeyVault/vaults/${kvName}
15+
1116
az keyvault secret set --name Message --vault-name ${kvName} --value "Hello from KV"

‎09b-alternate-hosted-template/SampleApp.csproj renamed to ‎09-hosted-console-template/HostedConsoleTemplate.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
1212
</ItemGroup>
1313

1414
</Project>

‎09c-indexer-api/SampleApp.csproj renamed to ‎09b-alternate-hosted-template/AltHostedConsoleTemplate.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
1212
</ItemGroup>
1313

1414
</Project>

‎09-hosted-console-template/SampleApp.csproj renamed to ‎09c-indexer-api/IndexerApi.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
1212
</ItemGroup>
1313

1414
</Project>

0 commit comments

Comments
 (0)