Temp removal of .net8

arnaudleclerc · Dec 18, 2024 · 0eeb019 · 0eeb019
1 parent ae0d5da
commit 0eeb019
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: | 
-          8.x
           9.x
     - name: Install dependencies
       run: dotnet restore ./src/AzureMapsControl.Components/AzureMapsControl.Components.csproj

diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -31,7 +31,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: | 
-          8.x
           9.x
     - name: Install dependencies
       run: dotnet restore ./src/AzureMapsControl.Components/AzureMapsControl.Components.csproj

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,7 +26,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: | 
-          8.x
           9.x
     - name: Install GitVersion
       uses: gittools/actions/gitversion/[email protected]
@@ -42,32 +41,32 @@ jobs:
       run: cd ./src/AzureMapsControl.Components && npm i --force
     - name: Lint
       run: cd ./src/AzureMapsControl.Components && npx eslint -c eslint.config.mjs
-    # - name: Build Typescript
-    #   run: cd ./src/AzureMapsControl.Components && npm run build
+    - name: Build Typescript
+      run: cd ./src/AzureMapsControl.Components && npm run build
     - name: Use GitVersion
       id: gitversion # step id used as reference for output values
       uses: gittools/actions/gitversion/[email protected]
-    # - name: Tag Repo Prerelease
-    #   if: ${{ steps.gitversion.outputs.branchName != 'master' && steps.gitversion.outputs.branchName != 'main' }}
-    #   uses: richardsimko/update-tag@v1
-    #   with:
-    #     tag_name: ${{ steps.gitversion.outputs.fullSemVer }}
-    #   env:
-    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    # - name: Tag Repo
-    #   if: ${{ steps.gitversion.outputs.branchName == 'master' || steps.gitversion.outputs.branchName == 'main' }}
-    #   uses: richardsimko/update-tag@v1
-    #   with:
-    #     tag_name: ${{ steps.gitversion.outputs.majorMinorPatch }}
-    #   env:
-    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Tag Repo Prerelease
+      if: ${{ steps.gitversion.outputs.branchName != 'master' && steps.gitversion.outputs.branchName != 'main' }}
+      uses: richardsimko/update-tag@v1
+      with:
+        tag_name: ${{ steps.gitversion.outputs.fullSemVer }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Tag Repo
+      if: ${{ steps.gitversion.outputs.branchName == 'master' || steps.gitversion.outputs.branchName == 'main' }}
+      uses: richardsimko/update-tag@v1
+      with:
+        tag_name: ${{ steps.gitversion.outputs.majorMinorPatch }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Pack PreRelease
       if: ${{ steps.gitversion.outputs.branchName != 'master' && steps.gitversion.outputs.branchName != 'main' }}
       run: dotnet pack ./src/AzureMapsControl.Components/AzureMapsControl.Components.csproj -p:Version='${{ steps.gitversion.outputs.fullSemVer }}"' -c Release --no-build
     - name: Pack
       if: ${{ steps.gitversion.outputs.branchName == 'master' || steps.gitversion.outputs.branchName == 'main' }}
       run: dotnet pack ./src/AzureMapsControl.Components/AzureMapsControl.Components.csproj -p:Version='${{ steps.gitversion.outputs.majorMinorPatch }}"' -c Release --no-build
-    # - name: Publish
-    #   env :
-    #     NUGETAPIKEY: ${{secrets.NUGETAPIKEY}}
-    #   run: dotnet nuget push "**/AzureMapsControl.Components*.nupkg" -s https://api.nuget.org/v3/index.json -k $NUGETAPIKEY --skip-duplicate
+    - name: Publish
+      env :
+        NUGETAPIKEY: ${{secrets.NUGETAPIKEY}}
+      run: dotnet nuget push "**/AzureMapsControl.Components*.nupkg" -s https://api.nuget.org/v3/index.json -k $NUGETAPIKEY --skip-duplicate
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -30,7 +30,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: | 
-          8.x
           9.x
     - name: Install dependencies
       run: dotnet restore ./src/AzureMapsControl.Components/AzureMapsControl.Components.csproj

diff --git a/src/AzureMapsControl.Components/AzureMapsControl.Components.csproj b/src/AzureMapsControl.Components/AzureMapsControl.Components.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
     <Authors>Arnaud Leclerc</Authors>
     <Company />
     <RepositoryUrl>https://github.com/arnaudleclerc/AzureMapsControl.Components</RepositoryUrl>
@@ -34,12 +34,7 @@
     <None Include="tsconfig.json" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+  <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
   </ItemGroup>

diff --git a/tests/AzureMapsControl.Components.Tests/AzureMapsControl.Components.Tests.csproj b/tests/AzureMapsControl.Components.Tests/AzureMapsControl.Components.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>