Skip to content

Commit 8d2be27

Browse files
DeadpikleDeadpikle
committed
Include .NET 8 in builds
1 parent 08e3f83 commit 8d2be27

File tree

9 files changed

+66
-16
lines changed

9 files changed

+66
-16
lines changed

‎.github/workflows/publish-nuget.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ jobs:
2222
# - name: Add MSBuild to PATH
2323
# uses: microsoft/setup-msbuild@v1.1.3
2424

25-
- name: Setup .NET 3.1, 5.0, 6.0, 7.0 for tests
25+
- name: Setup .NET 3.1, 5.0, 6.0, 7.0, 8.0 for tests
2626
uses: actions/setup-dotnet@v3.2.0
2727
with:
2828
dotnet-version: |
2929
3.1.x
3030
5.0.x
3131
6.0.x
3232
7.0.x
33+
8.0.x
3334
3435
- name: Run NetSparkle.Tests in .NET 3.1
3536
run: dotnet test -f netcoreapp3.1 ${{ github.workspace }}/src/NetSparkle.Tests/NetSparkle.Tests.csproj
@@ -52,6 +53,12 @@ jobs:
5253
- name: Run NetSparkle.Tests.AppCastGenerator in .NET 7
5354
run: dotnet test -f net7.0 ${{ github.workspace }}/src/NetSparkle.Tests.AppCastGenerator/NetSparkle.Tests.AppCastGenerator.csproj
5455

56+
- name: Run NetSparkle.Tests in .NET 8
57+
run: dotnet test -f net8.0 ${{ github.workspace }}/src/NetSparkle.Tests/NetSparkle.Tests.csproj
58+
59+
- name: Run NetSparkle.Tests.AppCastGenerator in .NET 8
60+
run: dotnet test -f net8.0 ${{ github.workspace }}/src/NetSparkle.Tests.AppCastGenerator/NetSparkle.Tests.AppCastGenerator.csproj
61+
5562
publish:
5663
name: Build and publish all packages to NuGet
5764
runs-on: windows-latest
@@ -80,6 +87,7 @@ jobs:
8087
5.0.x
8188
6.0.x
8289
7.0.x
90+
8.0.x
8391
8492
- name: Clean things to be safe
8593
run: |

‎src/NetSparkle.Tests.AppCastGenerator/NetSparkle.Tests.AppCastGenerator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net6;net5</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net7.0;net6;net5</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>

‎src/NetSparkle.Tests/NetSparkle.Tests.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ProjectGuid>{E50AC3A5-6C63-40D7-A4C4-9B359EFD5707}</ProjectGuid>
44
<RootNamespace>NetSparkleUnitTests</RootNamespace>
55
<AssemblyName>NetSparkleUnitTests</AssemblyName>
6-
<TargetFrameworks>net7.0;net6;net5;net452</TargetFrameworks>
6+
<TargetFrameworks>net8.0;net7.0;net6;net5;net452</TargetFrameworks>
77
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
88
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
99
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
@@ -44,12 +44,18 @@
4444
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6|AnyCPU'">
4545
<DefineConstants>DEBUG;TRACE;NETCORE;NET6</DefineConstants>
4646
</PropertyGroup>
47-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7/0|AnyCPU'">
47+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0|AnyCPU'">
4848
<DefineConstants>TRACE;NETCORE;NET7</DefineConstants>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0|AnyCPU'">
5151
<DefineConstants>DEBUG;TRACE;NETCORE;NET7</DefineConstants>
5252
</PropertyGroup>
53+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
54+
<DefineConstants>TRACE;NETCORE;NET7</DefineConstants>
55+
</PropertyGroup>
56+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
57+
<DefineConstants>DEBUG;TRACE;NETCORE;NET7</DefineConstants>
58+
</PropertyGroup>
5359
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
5460
<ItemGroup>
5561
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />

‎src/NetSparkle.Tools.AppCastGenerator/NetSparkle.Tools.AppCastGenerator.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<RootNamespace>NetSparkleUpdater.AppCastGenerator</RootNamespace>
66
<AssemblyName>NetSparkleUpdater.Tools.AppCastGenerator</AssemblyName>
7-
<TargetFrameworks>net7.0;net6;net5</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net7.0;net6;net5</TargetFrameworks>
88
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
99
<PublishUrl>publish\</PublishUrl>
1010
<Install>true</Install>
@@ -48,10 +48,10 @@
4848
</PropertyGroup>
4949
<PropertyGroup>
5050
<PostBuildEvent />
51-
<AssemblyVersion>2.3.0.0</AssemblyVersion>
52-
<FileVersion>2.3.0.0</FileVersion>
51+
<AssemblyVersion>2.4.0.0</AssemblyVersion>
52+
<FileVersion>2.4.0.0</FileVersion>
5353
<PackageId>NetSparkleUpdater.Tools.AppCastGenerator</PackageId>
54-
<Version>2.3.0</Version>
54+
<Version>2.4.0</Version>
5555
<Authors>Deadpikle</Authors>
5656
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
5757
<PackageProjectUrl>https://github.com/NetSparkleUpdater/NetSparkle</PackageProjectUrl>

‎src/NetSparkle.Tools.DSAHelper/NetSparkle.Tools.DSAHelper.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
<OutputType>Exe</OutputType>
66
<RootNamespace>NetSparkleUpdater.DSAHelper</RootNamespace>
77
<AssemblyName>NetSparkleUpdater.Tools.DSAHelper</AssemblyName>
8-
<TargetFrameworks>net7.0;net6;net5</TargetFrameworks>
8+
<TargetFrameworks>net8.0;net7.0;net6;net5</TargetFrameworks>
99
<AssemblyTitle>NetSparkle</AssemblyTitle>
1010
<Product>NetSparkleUpdater.Tools.DSAHelper</Product>
1111
<Description>Command line tool 'netsparkle-dsa' to generate and use DSA signatures. WARNING: DSA signatures are insecure. If possible, please use NetSparkleUpdater.Tools.AppCastGenerator instead to use ed25519 signatures. Use in conjunction with the NetSparkleUpdater library.</Description>
1212
<Copyright>Copyright © Dirk Eisenberg 2010, Deadpikle 2020-2023</Copyright>
13-
<AssemblyVersion>2.2.1.0</AssemblyVersion>
14-
<FileVersion>2.2.1.0</FileVersion>
13+
<AssemblyVersion>2.2.2.0</AssemblyVersion>
14+
<FileVersion>2.2.2.0</FileVersion>
1515
<OutputPath>..\..\bin\$(Configuration)\NetSparkle.Tools.DSAHelper\</OutputPath>
1616
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1717
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
18-
<Version>2.2.1</Version>
18+
<Version>2.2.2</Version>
1919
<Authors>Deadpikle</Authors>
2020
<Company>Deadpikle</Company>
2121
<PackAsTool>true</PackAsTool>

‎src/NetSparkle.UI.Avalonia/NetSparkle.UI.Avalonia.csproj‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net6;net5;netcoreapp3.1;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net7.0;net6;net5;netcoreapp3.1;netstandard2.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<PackageId>NetSparkleUpdater.UI.Avalonia</PackageId>
77
<Version>2.3.0-preview20231004001</Version>
@@ -48,6 +48,22 @@
4848
<DefineConstants>TRACE</DefineConstants>
4949
</PropertyGroup>
5050

51+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0|AnyCPU'">
52+
<DefineConstants>DEBUG;TRACE</DefineConstants>
53+
</PropertyGroup>
54+
55+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0|AnyCPU'">
56+
<DefineConstants>TRACE</DefineConstants>
57+
</PropertyGroup>
58+
59+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
60+
<DefineConstants>DEBUG;TRACE</DefineConstants>
61+
</PropertyGroup>
62+
63+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
64+
<DefineConstants>TRACE</DefineConstants>
65+
</PropertyGroup>
66+
5167
<ItemGroup>
5268
<None Remove="CheckingForUpdatesWindow.xaml" />
5369
<None Remove="DownloadProgressWindow.xaml" />

‎src/NetSparkle.UI.WPF/NetSparkle.UI.WPF.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<ProjectGuid>{6915843C-7947-4268-B569-6F5684651DF4}</ProjectGuid>
44
<UseWPF>true</UseWPF>
5-
<TargetFrameworks>net7.0-windows;net5-windows;net6-windows;netcoreapp3.1;net452</TargetFrameworks>
5+
<TargetFrameworks>net8.0-windows;net7.0-windows;net5-windows;net6-windows;netcoreapp3.1;net452</TargetFrameworks>
66
<AssemblyTitle>NetSparkleUpdater.UI.WPF</AssemblyTitle>
77
<Product>NetSparkleUpdater.UI.WPF</Product>
88
<Copyright>Copyright © 2023</Copyright>
@@ -61,6 +61,9 @@
6161
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows'">
6262
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
6363
</ItemGroup>
64+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
65+
<PackageReference Include="System.Drawing.Common" Version="8.0.0-rc.1.23419.5" />
66+
</ItemGroup>
6467
<ItemGroup>
6568
<None Include="..\..\LICENSE.md">
6669
<Pack>True</Pack>

‎src/NetSparkle.UI.WinForms.NetCore/NetSparkle.UI.WinForms.NetCore.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<RootNamespace>NetSparkleUpdater.UI.WinForms</RootNamespace>
55
<AssemblyName>NetSparkleUpdater.UI.WinForms</AssemblyName>
66
<UseWindowsForms>true</UseWindowsForms>
7-
<TargetFrameworks>net7.0-windows;net5-windows;net6-windows;netcoreapp3.1</TargetFrameworks>
7+
<TargetFrameworks>net8.0-windows;net7.0-windows;net5-windows;net6-windows;netcoreapp3.1</TargetFrameworks>
88
<AssemblyTitle>NetSparkle.NetFramework.WinForms</AssemblyTitle>
99
<Product>NetSparkleUpdater.UI.WinForms.NetCore</Product>
1010
<Copyright>Copyright © 2023</Copyright>
@@ -94,6 +94,9 @@
9494
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows'">
9595
<PackageReference Include="System.Drawing.Common" Version="7.0.0"/>
9696
</ItemGroup>
97+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
98+
<PackageReference Include="System.Drawing.Common" Version="8.0.0-rc.1.23419.5" />
99+
</ItemGroup>
97100
<ItemGroup>
98101
<Folder Include="Properties\" />
99102
</ItemGroup>

‎src/NetSparkle/NetSparkle.csproj‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net6;net5;netstandard2.0;netcoreapp3.1;net452</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net7.0;net6;net5;netstandard2.0;netcoreapp3.1;net452</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<PackageId>NetSparkleUpdater.SparkleUpdater</PackageId>
77
<Version>2.3.0-preview20231004001</Version>
@@ -84,6 +84,16 @@
8484
<DocumentationFile>..\bin\Debug\NetSparkle\NetSparkle.xml</DocumentationFile>
8585
<DefineConstants>DEBUG;TRACE;NETCORE;NET7</DefineConstants>
8686
</PropertyGroup>
87+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
88+
<OutputPath>..\bin\Release\NetSparkle\</OutputPath>
89+
<DocumentationFile>..\bin\Release\NetSparkle\NetSparkle.xml</DocumentationFile>
90+
<DefineConstants>TRACE;NETCORE;NET7</DefineConstants>
91+
</PropertyGroup>
92+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
93+
<OutputPath>..\bin\Debug\NetSparkle\</OutputPath>
94+
<DocumentationFile>..\bin\Debug\NetSparkle\NetSparkle.xml</DocumentationFile>
95+
<DefineConstants>DEBUG;TRACE;NETCORE;NET7</DefineConstants>
96+
</PropertyGroup>
8797
<!-- .NET 4.5.2 references, compilation flags and build options -->
8898
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
8999
<Reference Include="System" />
@@ -120,6 +130,10 @@
120130
<PackageReference Include="System.Text.Json" Version="7.0.3" />
121131
<!--<PackageReference Include="BouncyCastle.Cryptography" Version="2.0.0" /> TODO: 3.0 -->
122132
</ItemGroup>
133+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
134+
<PackageReference Include="System.Text.Json" Version="8.0.0-rc.1.23419.4" />
135+
<!--<PackageReference Include="BouncyCastle.Cryptography" Version="2.0.0" /> TODO: 3.0 -->
136+
</ItemGroup>
123137
<ItemGroup>
124138
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
125139
</ItemGroup>

0 commit comments

Comments
 (0)