Skip to content

Commit e8ae367

Browse files
ProgrammerALProgrammerAL
committed
Revert "Updated Update Conference demo code to .NET 9"
This reverts commit 7468c08.
1 parent 7468c08 commit e8ae367

File tree

11 files changed

+142
-150
lines changed

11 files changed

+142
-150
lines changed

‎.github/workflows/update-conf-2024-build-deployment-packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
permissions: write-all
1010
env:
1111
CONFIGURATION: Release
12-
DOTNET_VERSION: 9.x.x
12+
DOTNET_VERSION: 8.x.x
1313
CODE_DIRECTORY_PATH: ${{ github.workspace }}/update-conference-prague-2024/demo-code-feedback-system
1414
SRC_DIRECTORY_PATH: ${{ github.workspace }}/update-conference-prague-2024/demo-code-feedback-system/src
1515
BUILD_ARTIFACTS_PATH: ${{ github.workspace }}/build_artifacts

‎.github/workflows/update-conf-2024-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
environment: ${{ inputs.environment_name }}
3333
env:
3434
CONFIGURATION: Release
35-
DOTNET_VERSION: 9.x.x
35+
DOTNET_VERSION: 8.x.x
3636
NODE_VERSION: 14.x
3737
ARM_CLIENT_ID: ${{ secrets.arm_client_id }}
3838
ARM_CLIENT_SECRET: ${{ secrets.arm_client_secret }}

‎update-conference-prague-2024/demo-code-feedback-system/build/build/Build.csproj

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
4-
<TargetFramework>net9.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7-
<LangVersion>latest</LangVersion>
8-
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
9-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
10-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
11-
</PropertyGroup>
12-
<ItemGroup>
13-
<PackageReference Include="Cake.Frosting" Version="5.0.0" />
14-
</ItemGroup>
2+
<PropertyGroup>
3+
<OutputType>Exe</OutputType>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
<LangVersion>latest</LangVersion>
8+
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
9+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
10+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
15+
</ItemGroup>
1516
</Project>

‎update-conference-prague-2024/demo-code-feedback-system/deploy/deploy/Deploy.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
4-
<TargetFramework>net9.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7-
<LangVersion>latest</LangVersion>
8-
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
9-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
10-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
11-
</PropertyGroup>
12-
<ItemGroup>
13-
<PackageReference Include="Cake.Frosting" Version="5.0.0" />
14-
<PackageReference Include="Pulumi.Automation" Version="3.67.1" />
15-
</ItemGroup>
2+
<PropertyGroup>
3+
<OutputType>Exe</OutputType>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
<LangVersion>latest</LangVersion>
8+
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
9+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
10+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
11+
</PropertyGroup>
12+
<ItemGroup>
13+
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
14+
<PackageReference Include="Pulumi.Automation" Version="3.67.1" />
15+
</ItemGroup>
1616
</Project>

‎update-conference-prague-2024/demo-code-feedback-system/infra/Builders/ApiBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private ApiResources.FunctionInfra GenerateFunctionsInfrastructure(ApiResources.
106106

107107
var functionAppSiteConfig = new SiteConfigArgs
108108
{
109-
LinuxFxVersion = "DOTNET-ISOLATED|9.0",
109+
LinuxFxVersion = "DOTNET-ISOLATED|8.0",
110110
Cors = new CorsSettingsArgs
111111
{
112112
AllowedOrigins = new[] { "*" }

‎update-conference-prague-2024/demo-code-feedback-system/infra/PulumiInfra.csproj

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
4-
<TargetFramework>net9.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<RootNamespace>PulumiInfra</RootNamespace>
7-
<LangVersion>latest</LangVersion>
8-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
9-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
10-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
11-
</PropertyGroup>
12-
<ItemGroup>
13-
<PackageReference Include="Pulumi.AzureAD" Version="6.0.1" />
14-
<PackageReference Include="Pulumi" Version="3.67.1" />
15-
<PackageReference Include="Pulumi.AzureNative" Version="2.71.0" />
16-
</ItemGroup>
17-
</Project>
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<Nullable>enable</Nullable>
7+
<RootNamespace>PulumiInfra</RootNamespace>
8+
<LangVersion>latest</LangVersion>
9+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
10+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Pulumi.AzureAD" Version="6.0.1" />
15+
<PackageReference Include="Pulumi" Version="3.67.1" />
16+
<PackageReference Include="Pulumi.AzureNative" Version="2.67.0" />
17+
</ItemGroup>
18+
19+
</Project>

‎update-conference-prague-2024/demo-code-feedback-system/src/FeedbackFunctionsApp/FeedbackFunctionsApp.csproj

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
4-
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
5-
<OutputType>Exe</OutputType>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
8-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9-
<LangVersion>latest</LangVersion>
10-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
11-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
12-
</PropertyGroup>
13-
<ItemGroup>
14-
<PackageReference Include="Azure.Data.Tables" Version="12.9.1" />
15-
<PackageReference Include="Azure.Identity" Version="1.13.1" />
16-
<PackageReference Include="Microsoft.Azure.AppConfiguration.Functions.Worker" Version="8.0.0" />
17-
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
18-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
19-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" />
20-
</ItemGroup>
21-
<ItemGroup>
22-
<None Update="host.json">
23-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
24-
</None>
25-
<None Update="local.settings.json">
26-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27-
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
28-
</None>
29-
</ItemGroup>
30-
<ItemGroup>
31-
<Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext" />
32-
</ItemGroup>
2+
<PropertyGroup>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
5+
<OutputType>Exe</OutputType>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<LangVersion>latest</LangVersion><EnableNETAnalyzers>true</EnableNETAnalyzers><EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild></PropertyGroup>
10+
<ItemGroup>
11+
<PackageReference Include="Azure.Data.Tables" Version="12.9.1" />
12+
<PackageReference Include="Azure.Identity" Version="1.12.1" />
13+
<PackageReference Include="Microsoft.Azure.AppConfiguration.Functions.Worker" Version="7.3.0" />
14+
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
15+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
16+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.18.0" />
17+
</ItemGroup>
18+
<ItemGroup>
19+
<None Update="host.json">
20+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
21+
</None>
22+
<None Update="local.settings.json">
23+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
24+
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
25+
</None>
26+
</ItemGroup>
27+
<ItemGroup>
28+
<Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext" />
29+
</ItemGroup>
3330
</Project>

‎update-conference-prague-2024/demo-code-feedback-system/src/FeedbackFunctionsApp/Middleware/ExceptionHandlerMiddleware.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ public async Task Invoke(FunctionContext context, FunctionExecutionDelegate next
1919
{
2020
var req = await context.GetHttpRequestDataAsync();
2121
var response = req!.CreateResponse();
22-
await response.WriteAsJsonAsync(ex.ToString());
23-
response.StatusCode = HttpStatusCode.InternalServerError;
22+
await response.WriteAsJsonAsync(ex.ToString(), HttpStatusCode.InternalServerError);
2423

2524
SetHttpResponseData(context, response);
2625
}

‎update-conference-prague-2024/demo-code-feedback-system/src/FeedbackWebApp/FeedbackWebApp.csproj

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
2-
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
4-
<Nullable>enable</Nullable>
5-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<LangVersion>latest</LangVersion>
8-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
9-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
10-
</PropertyGroup>
11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
13-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
14-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
15-
<PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
16-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
17-
</ItemGroup>
18-
</Project>
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
<LangVersion>latest</LangVersion><EnableNETAnalyzers>true</EnableNETAnalyzers><EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild></PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
12+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" PrivateAssets="all" />
13+
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
14+
<PackageReference Include="QRCoder-ImageSharp" Version="0.10.0" />
15+
</ItemGroup>
16+
17+
</Project>

‎update-conference-prague-2024/demo-code-feedback-system/src/UiTests/UiTests.csproj

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
4-
<ImplicitUsings>enable</ImplicitUsings>
5-
<Nullable>enable</Nullable>
6-
<IsPackable>false</IsPackable>
7-
<IsTestProject>true</IsTestProject>
8-
<LangVersion>latest</LangVersion>
9-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10-
</PropertyGroup>
11-
<ItemGroup>
12-
<PackageReference Include="coverlet.collector" Version="6.0.2">
13-
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15-
</PackageReference>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
17-
<PackageReference Include="Microsoft.Playwright.MSTest" Version="1.48.0" />
18-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
19-
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
20-
</ItemGroup>
21-
<ItemGroup>
22-
<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
23-
</ItemGroup>
24-
<PropertyGroup Condition="'$(Configuration)'=='DEBUG'">
25-
<RunSettingsFilePath>$(MSBuildProjectDirectory)\.runsettings</RunSettingsFilePath>
26-
</PropertyGroup>
27-
<ItemGroup Condition="'$(Configuration)'=='Release'">
28-
<None Update=".runsettings">
29-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
30-
</None>
31-
</ItemGroup>
32-
<PropertyGroup>
33-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
34-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
35-
</PropertyGroup>
36-
</Project>
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
8+
<IsPackable>false</IsPackable>
9+
<IsTestProject>true</IsTestProject>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="coverlet.collector" Version="6.0.2">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
18+
<PackageReference Include="Microsoft.Playwright.MSTest" Version="1.48.0" />
19+
<PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
20+
<PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
25+
</ItemGroup>
26+
27+
<PropertyGroup Condition="'$(Configuration)'=='DEBUG'">
28+
<RunSettingsFilePath>$(MSBuildProjectDirectory)\.runsettings</RunSettingsFilePath>
29+
</PropertyGroup>
30+
31+
<ItemGroup Condition="'$(Configuration)'=='Release'">
32+
<None Update=".runsettings">
33+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
34+
</None>
35+
</ItemGroup>
36+
37+
</Project>

0 commit comments

Comments
 (0)