Skip to content

Commit

Permalink
Revert "feat: upgrade to dotnet9"
Browse files Browse the repository at this point in the history
This reverts commit 404401c.
  • Loading branch information
collinbarrett committed Feb 15, 2025
1 parent 16a752b commit 260e644
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 37 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ jobs:
- language: javascript-typescript
build-mode: none
steps:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: "9.0.x"

# CodeQL C# autobuild doesn't (yet?) recognize .NET Aspire
- if: matrix.language == 'csharp'
run: |
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/directory-migrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,12 @@ jobs:
git revert --no-edit $PREVIOUS_MIGRATION_HASH
fi
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: "9.0.x"

# Disabled GH Actions cache for Dependabot. https://github.com/dependabot/dependabot-core/issues/1303
# cache-dependency-path: services/Directory/FilterLists.Directory.Api/packages.lock.json
# cache: true
# Disabled GH Actions cache for Dependabot. https://github.com/dependabot/dependabot-core/issues/1303
# - name: Setup .NET
# uses: actions/setup-dotnet@v4
# with:
# cache-dependency-path: services/Directory/FilterLists.Directory.Api/packages.lock.json
# cache: true

- name: Install dotnet-ef
run: dotnet tool install --global dotnet-ef
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/directory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: "9.0.x"

# Disabled GH Actions cache for Dependabot. https://github.com/dependabot/dependabot-core/issues/1303
# cache-dependency-path: services/Directory/FilterLists.Directory.Api/packages.lock.json
# cache: true
# Disabled GH Actions cache for Dependabot. https://github.com/dependabot/dependabot-core/issues/1303
# - name: Setup .NET
# uses: actions/setup-dotnet@v4
# with:
# cache-dependency-path: services/Directory/FilterLists.Directory.Api/packages.lock.json
# cache: true

# - name: Restore
# run: dotnet restore --locked-mode
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AnalysisMode>Recommended</AnalysisMode>
Expand All @@ -23,8 +23,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2">
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.13"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AnalysisMode>Recommended</AnalysisMode>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AnalysisMode>Recommended</AnalysisMode>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="8.2.2"/>
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0"/>
</ItemGroup>

Expand Down
10 changes: 4 additions & 6 deletions services/FilterLists.AppHost/FilterLists.AppHost.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
Expand All @@ -17,8 +15,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0" />
<PackageReference Include="Aspire.Hosting.SqlServer" Version="9.0.0" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="8.2.2"/>
<PackageReference Include="Aspire.Hosting.SqlServer" Version="8.2.2"/>
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireSharedProject>true</IsAspireSharedProject>
Expand All @@ -12,8 +12,8 @@
<FrameworkReference Include="Microsoft.AspNetCore.App"/>

<PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0"/>
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0"/>
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.2.2"/>
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1"/>
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1"/>
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.0"/>
Expand Down

0 comments on commit 260e644

Please sign in to comment.