Skip to content

Commit 05bc914

Browse files
samypr100samypr100
authored
chore: .NET 9 support (#5)
1 parent bc178f0 commit 05bc914

9 files changed

Lines changed: 69 additions & 31 deletions

File tree

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ indent_size = 2
2525
tab_width = 4
2626
indent_size = 4
2727
indent_style = space
28+
29+
# https://github.com/dotnet/docs/issues/42724
30+
dotnet_diagnostic.WFO1000.severity = warning

‎.github/workflows/main.yml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ on:
1111
permissions:
1212
contents: read
1313

14+
concurrency:
15+
group: main-${{ github.head_ref || github.ref }}
16+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
17+
1418
env:
1519
DOTNET_NOLOGO: true
1620
DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -24,7 +28,7 @@ jobs:
2428
runs-on: ${{ matrix.os }}
2529

2630
strategy:
27-
fail-fast: true
31+
fail-fast: false
2832
matrix:
2933
configuration: [ Debug, Release ]
3034
os: [ windows-2022 ]
@@ -35,13 +39,14 @@ jobs:
3539

3640
steps:
3741

38-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
3943

4044
# Assuming .NET Framework flavors are available in OS
4145
- name: Install .NET Core Runtimes
42-
uses: actions/setup-dotnet@v3
46+
uses: actions/setup-dotnet@v4
4347
with:
4448
dotnet-version: |
49+
9.0.x
4550
8.0.x
4651
7.0.x
4752
6.0.x
@@ -50,7 +55,7 @@ jobs:
5055
5156
# https://github.com/microsoft/setup-msbuild
5257
- name: Add MSBuild.exe to PATH
53-
uses: microsoft/setup-msbuild@v1
58+
uses: microsoft/setup-msbuild@v2
5459

5560
# Setup Short SHA
5661
- name: Setup Short SHA
@@ -71,7 +76,7 @@ jobs:
7176
# Create NuGet Cache
7277
- name: NuGet Cache
7378
id: nuget-cache
74-
uses: actions/cache@v3
79+
uses: actions/cache@v4
7580
with:
7681
path: ${{ env.NUGET_PACKAGES }}
7782
key: ${{ matrix.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -93,7 +98,7 @@ jobs:
9398
# Upload Build Artifacts
9499
- name: Upload Build Artifacts
95100
if: matrix.configuration == 'Release'
96-
uses: actions/upload-artifact@v3
101+
uses: actions/upload-artifact@v4
97102
with:
98103
name: nupkg-${{ env.build_sha }}
99104
path: ${{env.SRC_SLN_PATH}}/**/bin/${{ matrix.configuration }}/*.*nupkg
@@ -112,13 +117,13 @@ jobs:
112117
run: echo "build_sha=${GITHUB_SHA::7}" >> $GITHUB_ENV
113118

114119
- name: Download Build Artifacts
115-
uses: actions/download-artifact@v3
120+
uses: actions/download-artifact@v4
116121
with:
117122
name: nupkg-${{ env.build_sha }}
118123

119-
- uses: actions/setup-dotnet@v3
124+
- uses: actions/setup-dotnet@v4
120125
with:
121-
dotnet-version: '8.0.x'
126+
dotnet-version: '9.0.x'
122127

123128
- name: Push to NuGet
124129
run: |
@@ -143,13 +148,13 @@ jobs:
143148
run: echo "build_sha=${GITHUB_SHA::7}" >> $GITHUB_ENV
144149

145150
- name: Download Build Artifacts
146-
uses: actions/download-artifact@v3
151+
uses: actions/download-artifact@v4
147152
with:
148153
name: nupkg-${{ env.build_sha }}
149154

150-
- uses: actions/setup-dotnet@v3
155+
- uses: actions/setup-dotnet@v4
151156
with:
152-
dotnet-version: '8.0.x'
157+
dotnet-version: '9.0.x'
153158

154159
- name: Push to NuGet
155160
run: |

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
### v1.1.7
2+
3+
**Core 1.1.7**
4+
**Shell 1.1.7**
5+
**ShellExtensions 1.1.7**
6+
**Sensors 1.1.7**
7+
**ExtendedLinguisticServices 1.1.7**
8+
9+
- Added new target .NET 9.0
10+
111
### v1.1.6
212

313
**Core 1.1.6**

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
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.
99

10-
Now with added .NET 6.0, .NET 7.0, and .NET 8.0 support ! (windows only)
10+
Now with added .NET 6.0, .NET 7.0, .NET 8.0, and .NET 9.0 support ! (windows only)
1111

1212
## NuGet packages (recommended)
1313

‎source/WindowsAPICodePack/Core/Core.csproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,26 @@
33
<PropertyGroup>
44
<AssemblyName>Microsoft.WindowsAPICodePack</AssemblyName>
55
<PackageId>Microsoft-WindowsAPICodePack-Core-6.0</PackageId>
6-
<VersionPrefix>1.1.6</VersionPrefix>
6+
<VersionPrefix>1.1.7</VersionPrefix>
77
<Title>$(AssemblyName)</Title>
88
<Authors>rpastric;contre;dahall;samypr100</Authors>
99
<Company>Microsoft</Company>
1010
<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
11+
<PackageReadmeFile>README.md</PackageReadmeFile>
1112
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1213
<PackageProjectUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</PackageProjectUrl>
1314
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1415
<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>
15-
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md </PackageReleaseNotes>
16+
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md</PackageReleaseNotes>
1617
<RepositoryUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</RepositoryUrl>
1718
<RepositoryType>.git</RepositoryType>
18-
<Copyright>Copyright © 2023</Copyright>
19+
<Copyright>Copyright © 2024</Copyright>
1920
<NeutralLanguage>en-US</NeutralLanguage>
2021
<PackageTags>WindowsAPICodePack</PackageTags>
2122
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2223
<IncludeSymbols>true</IncludeSymbols>
2324
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24-
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
25+
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
2526
<UseWindowsForms>true</UseWindowsForms>
2627
<LangVersion>latest</LangVersion>
2728
<RootNamespace>Microsoft.WindowsAPICodePack</RootNamespace>
@@ -30,6 +31,9 @@
3031
<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
3132
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
3233
</PropertyGroup>
34+
<ItemGroup>
35+
<None Include="..\..\..\README.md" Pack="true" PackagePath=""/>
36+
</ItemGroup>
3337
<ItemGroup>
3438
<None Include="..\..\..\LICENSE" Pack="true" PackagePath=""/>
3539
</ItemGroup>

‎source/WindowsAPICodePack/ExtendedLinguisticServices/ExtendedLinguisticServices.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,36 @@
33
<PropertyGroup>
44
<AssemblyName>Microsoft.WindowsAPICodePack.ExtendedLinguisticServices</AssemblyName>
55
<PackageId>Microsoft-WindowsAPICodePack-ExtendedLinguisticServices-6.0</PackageId>
6-
<VersionPrefix>1.1.6</VersionPrefix>
6+
<VersionPrefix>1.1.7</VersionPrefix>
77
<Title>$(AssemblyName)</Title>
88
<Authors>rpastric;contre;dahall;samypr100</Authors>
99
<Company>Microsoft</Company>
1010
<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
11+
<PackageReadmeFile>README.md</PackageReadmeFile>
1112
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1213
<PackageProjectUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</PackageProjectUrl>
1314
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1415
<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>
1516
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md</PackageReleaseNotes>
1617
<RepositoryUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</RepositoryUrl>
1718
<RepositoryType>.git</RepositoryType>
18-
<Copyright>Copyright © 2023</Copyright>
19+
<Copyright>Copyright © 2024</Copyright>
1920
<NeutralLanguage>en-US</NeutralLanguage>
2021
<PackageTags>WindowsAPICodePack</PackageTags>
2122
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2223
<IncludeSymbols>true</IncludeSymbols>
2324
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24-
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
25+
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
2526
<UseWindowsForms>true</UseWindowsForms>
2627
<LangVersion>latest</LangVersion>
2728
<RootNamespace>Microsoft.WindowsAPICodePack.ExtendedLinguisticServices</RootNamespace>
2829
<DocumentationFile>..\bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
2930
<SignAssembly>true</SignAssembly>
3031
<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
3132
</PropertyGroup>
33+
<ItemGroup>
34+
<None Include="..\..\..\README.md" Pack="true" PackagePath=""/>
35+
</ItemGroup>
3236
<ItemGroup>
3337
<None Include="..\..\..\LICENSE" Pack="true" PackagePath=""/>
3438
</ItemGroup>

‎source/WindowsAPICodePack/Sensors/Sensors.csproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,36 @@
33
<PropertyGroup>
44
<AssemblyName>Microsoft.WindowsAPICodePack.Sensors</AssemblyName>
55
<PackageId>Microsoft-WindowsAPICodePack-Sensors-6.0</PackageId>
6-
<VersionPrefix>1.1.6</VersionPrefix>
6+
<VersionPrefix>1.1.7</VersionPrefix>
77
<Title>$(AssemblyName)</Title>
88
<Authors>rpastric;contre;dahall;samypr100</Authors>
99
<Company>Microsoft</Company>
1010
<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
11+
<PackageReadmeFile>README.md</PackageReadmeFile>
1112
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1213
<PackageProjectUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</PackageProjectUrl>
1314
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1415
<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>
15-
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md </PackageReleaseNotes>
16+
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md</PackageReleaseNotes>
1617
<RepositoryUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</RepositoryUrl>
1718
<RepositoryType>.git</RepositoryType>
18-
<Copyright>Copyright © 2023</Copyright>
19+
<Copyright>Copyright © 2024</Copyright>
1920
<NeutralLanguage>en-US</NeutralLanguage>
2021
<PackageTags>WindowsAPICodePack</PackageTags>
2122
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2223
<IncludeSymbols>true</IncludeSymbols>
2324
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24-
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
25+
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
2526
<UseWindowsForms>true</UseWindowsForms>
2627
<LangVersion>latest</LangVersion>
2728
<RootNamespace>Microsoft.WindowsAPICodePack.Sensors</RootNamespace>
2829
<DocumentationFile>..\bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
2930
<SignAssembly>true</SignAssembly>
3031
<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
3132
</PropertyGroup>
33+
<ItemGroup>
34+
<None Include="..\..\..\README.md" Pack="true" PackagePath=""/>
35+
</ItemGroup>
3236
<ItemGroup>
3337
<None Include="..\..\..\LICENSE" Pack="true" PackagePath=""/>
3438
</ItemGroup>

‎source/WindowsAPICodePack/Shell/Shell.csproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,26 @@
33
<PropertyGroup>
44
<AssemblyName>Microsoft.WindowsAPICodePack.Shell</AssemblyName>
55
<PackageId>Microsoft-WindowsAPICodePack-Shell-6.0</PackageId>
6-
<VersionPrefix>1.1.6</VersionPrefix>
6+
<VersionPrefix>1.1.7</VersionPrefix>
77
<Title>$(AssemblyName)</Title>
88
<Authors>rpastric;contre;dahall;samypr100</Authors>
99
<Company>Microsoft</Company>
1010
<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
11+
<PackageReadmeFile>README.md</PackageReadmeFile>
1112
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1213
<PackageProjectUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</PackageProjectUrl>
1314
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1415
<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>
15-
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md </PackageReleaseNotes>
16+
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md</PackageReleaseNotes>
1617
<RepositoryUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</RepositoryUrl>
1718
<RepositoryType>.git</RepositoryType>
18-
<Copyright>Copyright © 2023</Copyright>
19+
<Copyright>Copyright © 2024</Copyright>
1920
<NeutralLanguage>en-US</NeutralLanguage>
2021
<PackageTags>WindowsAPICodePack</PackageTags>
2122
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2223
<IncludeSymbols>true</IncludeSymbols>
2324
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24-
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
25+
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
2526
<UseWindowsForms>true</UseWindowsForms>
2627
<UseWPF>true</UseWPF>
2728
<LangVersion>latest</LangVersion>
@@ -30,6 +31,9 @@
3031
<SignAssembly>true</SignAssembly>
3132
<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
3233
</PropertyGroup>
34+
<ItemGroup>
35+
<None Include="..\..\..\README.md" Pack="true" PackagePath=""/>
36+
</ItemGroup>
3337
<ItemGroup>
3438
<None Include="..\..\..\LICENSE" Pack="true" PackagePath=""/>
3539
</ItemGroup>

‎source/WindowsAPICodePack/ShellExtensions/ShellExtensions.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,26 @@
33
<PropertyGroup>
44
<AssemblyName>Microsoft.WindowsAPICodePack.ShellExtensions</AssemblyName>
55
<PackageId>Microsoft-WindowsAPICodePack-ShellExtensions-6.0</PackageId>
6-
<VersionPrefix>1.1.6</VersionPrefix>
6+
<VersionPrefix>1.1.7</VersionPrefix>
77
<Title>$(AssemblyName)</Title>
88
<Authors>rpastric;contre;dahall;samypr100</Authors>
99
<Company>Microsoft</Company>
1010
<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
11+
<PackageReadmeFile>README.md</PackageReadmeFile>
1112
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1213
<PackageProjectUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</PackageProjectUrl>
1314
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1415
<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>
1516
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/samypr100/Windows-API-Code-Pack-1.1/blob/main/CHANGELOG.md</PackageReleaseNotes>
1617
<RepositoryUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</RepositoryUrl>
1718
<RepositoryType>.git</RepositoryType>
18-
<Copyright>Copyright © 2023</Copyright>
19+
<Copyright>Copyright © 2024</Copyright>
1920
<NeutralLanguage>en-US</NeutralLanguage>
2021
<PackageTags>WindowsAPICodePack</PackageTags>
2122
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2223
<IncludeSymbols>true</IncludeSymbols>
2324
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24-
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
25+
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
2526
<UseWindowsForms>true</UseWindowsForms>
2627
<UseWPF>true</UseWPF>
2728
<LangVersion>latest</LangVersion>
@@ -30,6 +31,9 @@
3031
<SignAssembly>true</SignAssembly>
3132
<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
3233
</PropertyGroup>
34+
<ItemGroup>
35+
<None Include="..\..\..\README.md" Pack="true" PackagePath=""/>
36+
</ItemGroup>
3337
<ItemGroup>
3438
<None Include="..\..\..\LICENSE" Pack="true" PackagePath=""/>
3539
</ItemGroup>

0 commit comments

Comments
 (0)