Merge pull request #2 from koculu/upgrade-to-net-9.0

Upgrade to net 9.0
koculu · Nov 14, 2024 · 1fc363b · 1fc363b
2 parents 76c6163 + 9a92f76
commit 1fc363b
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 59 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -2,34 +2,35 @@ name: Build and Test
 
 on:
   push:
-    branches: [ "main" ]    
+    branches: ['main']
     paths-ignore:
-    - '*.md'
+      - '*.md'
   pull_request:
-    branches: [ "main" ]
+    branches: ['main']
     paths-ignore:
-    - '*.md'
+      - '*.md'
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: |
-          7.0.x
-          6.0.x
-    - name: Display dotnet version
-      run: dotnet --version
-    - name: Restore dependencies
-      working-directory: ./src
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
-      working-directory: ./src
-    - name: Test
-      run: dotnet test --no-build --configuration Release --verbosity normal
-      working-directory: ./src
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            9.0.x
+            8.0.x
+            7.0.x
+            6.0.x
+      - name: Display dotnet version
+        run: dotnet --version
+      - name: Restore dependencies
+        working-directory: ./src
+        run: dotnet restore
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+        working-directory: ./src
+      - name: Test
+        run: dotnet test --no-build --configuration Release --verbosity normal
+        working-directory: ./src
diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
@@ -4,33 +4,34 @@ on:
   workflow_dispatch:
     inputs:
       name:
-        description: "When you press run workflow, the nuget package will be published."
-        default: "I understand."
+        description: 'When you press run workflow, the nuget package will be published.'
+        default: 'I understand.'
 jobs:
   build:
-
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: |
-          7.0.x
-          6.0.x
-    - name: Display dotnet version
-      run: dotnet --version
-    - name: Restore dependencies
-      working-directory: ./src
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
-      working-directory: ./src
-    - name: Test
-      run: dotnet test --no-build --configuration Release --verbosity normal
-      working-directory: ./src
-    - name: Publish the package to nuget.org
-      run: dotnet nuget push TopazView/bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
-      env:
-        NUGET_AUTH_TOKEN: ${{ secrets.NUGET_TOKEN }}
-      working-directory: ./src
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: |
+            9.0.x
+            8.0.x
+            7.0.x
+            6.0.x
+      - name: Display dotnet version
+        run: dotnet --version
+      - name: Restore dependencies
+        working-directory: ./src
+        run: dotnet restore
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+        working-directory: ./src
+      - name: Test
+        run: dotnet test --no-build --configuration Release --verbosity normal
+        working-directory: ./src
+      - name: Publish the package to nuget.org
+        run: dotnet nuget push TopazView/bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
+        env:
+          NUGET_AUTH_TOKEN: ${{ secrets.NUGET_TOKEN }}
+        working-directory: ./src
diff --git a/src/TopazView.UnitTests/TopazView.UnitTests.csproj b/src/TopazView.UnitTests/TopazView.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <IsPackable>false</IsPackable>

diff --git a/src/TopazView/Directory.Build.props b/src/TopazView/Directory.Build.props
@@ -5,8 +5,8 @@
     <Authors>Ahmed Yasin Koculu</Authors>
     <PackageId>TopazView</PackageId>
     <Title>TopazView</Title>
-    <ProductVersion>1.0.9.0</ProductVersion>
-    <Version>1.0.9.0</Version>
+    <ProductVersion>1.1.0.0</ProductVersion>
+    <Version>1.1.0.0</Version>
     <Authors>Ahmed Yasin Koculu</Authors>
     <AssemblyTitle>TopazView</AssemblyTitle>
     <Description>TopazView is a lightweight view engine that utilizes the Topaz JavaScript Engine.</Description>

diff --git a/src/TopazView/TopazView.csproj b/src/TopazView/TopazView.csproj
@@ -4,7 +4,7 @@
     <Deterministic>true</Deterministic>
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
     <RepositoryUrl>https://github.com/koculu/TopazView</RepositoryUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -19,8 +19,9 @@
     <RootNamespace>Tenray.TopazView</RootNamespace>
     <Configurations>Debug;Release</Configurations>
     <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-    <RunAnalyzersDuringLiveAnalysis>True</RunAnalyzersDuringLiveAnalysis>
+    <RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
     <AnalysisMode>All</AnalysisMode>
+    <RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
   </PropertyGroup>
 
   <ItemGroup>
@@ -35,7 +36,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Topaz" Version="1.4.0" />
+    <PackageReference Include="Topaz" Version="1.4.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/samples/AspNetCoreMVCSample/AspNetCoreMVCSample.csproj b/src/samples/AspNetCoreMVCSample/AspNetCoreMVCSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>

diff --git a/src/samples/WebView2Sample/WebView2Sample.csproj b/src/samples/WebView2Sample/WebView2Sample.csproj
@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Nullable>disable</Nullable>
     <UseWPF>true</UseWPF>
     <StartupObject>WebView2Sample.Program</StartupObject>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2849.39" />
     <PackageReference Include="SimpleInjector" Version="5.5.0" />
   </ItemGroup>