chore: .NET 9 support (#5)

samypr100 · Nov 24, 2024 · 05bc914 · 05bc914
1 parent bc178f0
commit 05bc914
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 31 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -25,3 +25,6 @@ indent_size = 2
 tab_width = 4
 indent_size = 4
 indent_style = space
+
+# https://github.com/dotnet/docs/issues/42724
+dotnet_diagnostic.WFO1000.severity = warning
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,6 +11,10 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: main-${{ github.head_ref || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -24,7 +28,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         configuration: [ Debug, Release ]
         os: [ windows-2022 ]
@@ -35,13 +39,14 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Assuming .NET Framework flavors are available in OS
       - name: Install .NET Core Runtimes
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
+            9.0.x
             8.0.x
             7.0.x
             6.0.x
@@ -50,7 +55,7 @@ jobs:
 
       # https://github.com/microsoft/setup-msbuild
       - name: Add MSBuild.exe to PATH
-        uses: microsoft/setup-msbuild@v1
+        uses: microsoft/setup-msbuild@v2
 
       # Setup Short SHA
       - name: Setup Short SHA
@@ -71,7 +76,7 @@ jobs:
       # Create NuGet Cache
       - name: NuGet Cache
         id: nuget-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.NUGET_PACKAGES }}
           key: ${{ matrix.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -93,7 +98,7 @@ jobs:
       # Upload Build Artifacts
       - name: Upload Build Artifacts
         if: matrix.configuration == 'Release'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: nupkg-${{ env.build_sha }}
           path: ${{env.SRC_SLN_PATH}}/**/bin/${{ matrix.configuration }}/*.*nupkg
@@ -112,13 +117,13 @@ jobs:
         run: echo "build_sha=${GITHUB_SHA::7}" >> $GITHUB_ENV
 
       - name: Download Build Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nupkg-${{ env.build_sha }}
 
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
 
       - name: Push to NuGet
         run: |
@@ -143,13 +148,13 @@ jobs:
         run: echo "build_sha=${GITHUB_SHA::7}" >> $GITHUB_ENV
 
       - name: Download Build Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: nupkg-${{ env.build_sha }}
 
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
 
       - name: Push to NuGet
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+### v1.1.7
+
+**Core 1.1.7**
+**Shell 1.1.7**
+**ShellExtensions 1.1.7**
+**Sensors 1.1.7**
+**ExtendedLinguisticServices 1.1.7**
+
+- Added new target .NET 9.0
+
 ### v1.1.6
 
 **Core 1.1.6**

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 This is a fork of the Microsoft © Windows API Code Pack, based on a repository created by [contre](https://github.com/contre/Windows-API-Code-Pack-1.1). Due to the lack of updates to the original package, this fork was created to add support for all current .NET Framework and .NET Core versions.
 
-Now with added .NET 6.0, .NET 7.0, and .NET 8.0 support ! (windows only)
+Now with added .NET 6.0, .NET 7.0, .NET 8.0, and .NET 9.0 support ! (windows only)
 
 ## NuGet packages (recommended)
 

diff --git a/source/WindowsAPICodePack/Core/Core.csproj b/source/WindowsAPICodePack/Core/Core.csproj
@@ -3,25 +3,26 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.WindowsAPICodePack</AssemblyName>
     <PackageId>Microsoft-WindowsAPICodePack-Core-6.0</PackageId>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.7</VersionPrefix>
     <Title>$(AssemblyName)</Title>
     <Authors>rpastric;contre;dahall;samypr100</Authors>
     <Company>Microsoft</Company>
     <Product>Microsoft Windows API Code Pack for .NET Framework</Product>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Description>The Core code for the WindowsAPICodePack. This is an updated version containing all available bug fixes for this code as of 2021-01-05.</Description>
-    <PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md </PackageReleaseNotes>
+    <PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</RepositoryUrl>
     <RepositoryType>.git</RepositoryType>
-    <Copyright>Copyright © 2023</Copyright>
+    <Copyright>Copyright © 2024</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageTags>WindowsAPICodePack</PackageTags>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <LangVersion>latest</LangVersion>
     <RootNamespace>Microsoft.WindowsAPICodePack</RootNamespace>
@@ -30,6 +31,9 @@
     <AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\..\..\README.md" Pack="true" PackagePath=""/>
+  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\LICENSE" Pack="true" PackagePath=""/>
   </ItemGroup>

diff --git a/source/WindowsAPICodePack/ExtendedLinguisticServices/ExtendedLinguisticServices.csproj b/source/WindowsAPICodePack/ExtendedLinguisticServices/ExtendedLinguisticServices.csproj
@@ -3,32 +3,36 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.WindowsAPICodePack.ExtendedLinguisticServices</AssemblyName>
     <PackageId>Microsoft-WindowsAPICodePack-ExtendedLinguisticServices-6.0</PackageId>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.7</VersionPrefix>
     <Title>$(AssemblyName)</Title>
     <Authors>rpastric;contre;dahall;samypr100</Authors>
     <Company>Microsoft</Company>
     <Product>Microsoft Windows API Code Pack for .NET Framework</Product>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Description>The Extended Linguistic Services code for the WindowsAPICodePack. This is an updated version containing all available bug fixes for this code as of 2021-01-05.</Description>
     <PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</RepositoryUrl>
     <RepositoryType>.git</RepositoryType>
-    <Copyright>Copyright © 2023</Copyright>
+    <Copyright>Copyright © 2024</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageTags>WindowsAPICodePack</PackageTags>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <LangVersion>latest</LangVersion>
     <RootNamespace>Microsoft.WindowsAPICodePack.ExtendedLinguisticServices</RootNamespace>
     <DocumentationFile>..\bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\..\..\README.md" Pack="true" PackagePath=""/>
+  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\LICENSE" Pack="true" PackagePath=""/>
   </ItemGroup>

diff --git a/source/WindowsAPICodePack/Sensors/Sensors.csproj b/source/WindowsAPICodePack/Sensors/Sensors.csproj
@@ -3,32 +3,36 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.WindowsAPICodePack.Sensors</AssemblyName>
     <PackageId>Microsoft-WindowsAPICodePack-Sensors-6.0</PackageId>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.7</VersionPrefix>
     <Title>$(AssemblyName)</Title>
     <Authors>rpastric;contre;dahall;samypr100</Authors>
     <Company>Microsoft</Company>
     <Product>Microsoft Windows API Code Pack for .NET Framework</Product>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Description>The Sensors code for the WindowsAPICodePack. This is an updated version containing all available bug fixes for this code as of 2021-01-05.</Description>
-    <PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md </PackageReleaseNotes>
+    <PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</RepositoryUrl>
     <RepositoryType>.git</RepositoryType>
-    <Copyright>Copyright © 2023</Copyright>
+    <Copyright>Copyright © 2024</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageTags>WindowsAPICodePack</PackageTags>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <LangVersion>latest</LangVersion>
     <RootNamespace>Microsoft.WindowsAPICodePack.Sensors</RootNamespace>
     <DocumentationFile>..\bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\..\..\README.md" Pack="true" PackagePath=""/>
+  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\LICENSE" Pack="true" PackagePath=""/>
   </ItemGroup>

diff --git a/source/WindowsAPICodePack/Shell/Shell.csproj b/source/WindowsAPICodePack/Shell/Shell.csproj
@@ -3,25 +3,26 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.WindowsAPICodePack.Shell</AssemblyName>
     <PackageId>Microsoft-WindowsAPICodePack-Shell-6.0</PackageId>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.7</VersionPrefix>
     <Title>$(AssemblyName)</Title>
     <Authors>rpastric;contre;dahall;samypr100</Authors>
     <Company>Microsoft</Company>
     <Product>Microsoft Windows API Code Pack for .NET Framework</Product>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Description>The Shell code for the WindowsAPICodePack. This is an updated version containing all available bug fixes for this code as of 2021-01-05.</Description>
-    <PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md </PackageReleaseNotes>
+    <PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</RepositoryUrl>
     <RepositoryType>.git</RepositoryType>
-    <Copyright>Copyright © 2023</Copyright>
+    <Copyright>Copyright © 2024</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageTags>WindowsAPICodePack</PackageTags>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
     <LangVersion>latest</LangVersion>
@@ -30,6 +31,9 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\..\..\README.md" Pack="true" PackagePath=""/>
+  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\LICENSE" Pack="true" PackagePath=""/>
   </ItemGroup>

diff --git a/source/WindowsAPICodePack/ShellExtensions/ShellExtensions.csproj b/source/WindowsAPICodePack/ShellExtensions/ShellExtensions.csproj
@@ -3,25 +3,26 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.WindowsAPICodePack.ShellExtensions</AssemblyName>
     <PackageId>Microsoft-WindowsAPICodePack-ShellExtensions-6.0</PackageId>
-    <VersionPrefix>1.1.6</VersionPrefix>
+    <VersionPrefix>1.1.7</VersionPrefix>
     <Title>$(AssemblyName)</Title>
     <Authors>rpastric;contre;dahall;samypr100</Authors>
     <Company>Microsoft</Company>
     <Product>Microsoft Windows API Code Pack for .NET Framework</Product>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Description>The ShellExtensions code for the WindowsAPICodePack. This is an updated version containing all available bug fixes for this code as of 2021-01-05.</Description>
     <PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</RepositoryUrl>
     <RepositoryType>.git</RepositoryType>
-    <Copyright>Copyright © 2023</Copyright>
+    <Copyright>Copyright © 2024</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageTags>WindowsAPICodePack</PackageTags>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <UseWPF>true</UseWPF>
     <LangVersion>latest</LangVersion>
@@ -30,6 +31,9 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\..\..\README.md" Pack="true" PackagePath=""/>
+  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\LICENSE" Pack="true" PackagePath=""/>
   </ItemGroup>