Skip to content

Commit fd2437c

Browse files
dylanhanddylanhand
committed
Upgrade from .NET 5 to 8
1 parent e8a9ff7 commit fd2437c

File tree

3 files changed

+204
-211
lines changed

3 files changed

+204
-211
lines changed

‎Divvun.Installer.OneClick/Divvun.Installer.OneClick.csproj

Lines changed: 78 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,81 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3-
<Import Project="$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.props" Condition=" '$(_TargetAssemblyProjectName)' != '' and '$(ImportProjectExtensionProps)' != 'false' and exists('$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.props')" />
4-
<PropertyGroup>
5-
<OutputType>WinExe</OutputType>
6-
<PublishDir>publish\</PublishDir>
7-
<SelfContained>false</SelfContained>
8-
<PublishSingleFile>true</PublishSingleFile>
9-
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<ApplicationIcon>../Divvun.Installer/divvun-logo-512.ico</ApplicationIcon>
12-
<Platform>x86</Platform>
13-
<RootNamespace>Divvun.Installer.OneClick</RootNamespace>
14-
<AssemblyName>Divvun.Installer.OneClick</AssemblyName>
15-
<TargetFramework>net5.0-windows</TargetFramework>
16-
<Nullable>enable</Nullable>
17-
<LangVersion>8.0</LangVersion>
18-
<WarningsAsErrors>CS8600;CS8602;CS8603</WarningsAsErrors>
19-
<UseWPF>true</UseWPF>
20-
</PropertyGroup>
21-
<PropertyGroup>
22-
<ApplicationManifest>app.manifest</ApplicationManifest>
23-
</PropertyGroup>
24-
<ItemGroup>
25-
<Resource Include="Resources\iso639-autonyms.tsv" />
26-
<None Include="app.manifest" />
27-
<None Include="Properties\Settings.settings">
28-
<Generator>SettingsSingleFileGenerator</Generator>
29-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
30-
</None>
31-
</ItemGroup>
32-
<ItemGroup>
33-
<None Include="App.config" />
34-
</ItemGroup>
35-
<ItemGroup>
36-
<ProjectReference Include="..\FlatBuffers\FlatBuffers.csproj" />
37-
<ProjectReference Include="..\Pahkat.Sdk.Rpc\Pahkat.Sdk.Rpc.csproj" />
38-
<ProjectReference Include="..\Pahkat.Sdk\Pahkat.Sdk.csproj" />
39-
</ItemGroup>
40-
<ItemGroup>
41-
<WCFMetadata Include="Connected Services\" />
42-
</ItemGroup>
43-
<ItemGroup>
44-
<PackageReference Include="CsvHelper">
45-
<Version>6.1.0</Version>
46-
</PackageReference>
47-
<PackageReference Include="Flurl">
48-
<Version>3.0.2</Version>
49-
</PackageReference>
50-
<PackageReference Include="Iterable">
51-
<Version>0.2.0</Version>
52-
</PackageReference>
53-
<PackageReference Include="Newtonsoft.Json">
54-
<Version>13.0.3</Version>
55-
</PackageReference>
56-
<PackageReference Include="Serilog" Version="2.9.0" />
57-
<PackageReference Include="Sentry" Version="3.11.1" />
58-
<PackageReference Include="Sentry.Serilog" Version="3.11.1" />
59-
<PackageReference Include="Serilog.Exceptions" Version="7.1.0" />
60-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0-dev-00839" />
61-
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.2.0-dev-00747" />
62-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119">
63-
<PrivateAssets>all</PrivateAssets>
64-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
65-
</PackageReference>
66-
</ItemGroup>
67-
<ItemGroup>
68-
<Compile Update="Strings.Designer.cs">
69-
<DesignTime>True</DesignTime>
70-
<AutoGen>True</AutoGen>
71-
<DependentUpon>Strings.resx</DependentUpon>
72-
</Compile>
73-
</ItemGroup>
74-
<ItemGroup>
75-
<EmbeddedResource Update="Strings.resx">
76-
<Generator>PublicResXFileCodeGenerator</Generator>
77-
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
78-
</EmbeddedResource>
79-
</ItemGroup>
80-
81-
<Import Project="$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.targets" Condition=" '$(_TargetAssemblyProjectName)' != '' and '$(ImportProjectExtensionProps)' != 'false' and exists('$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.targets')" />
3+
<Import Project="$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.props" Condition=" '$(_TargetAssemblyProjectName)' != '' and '$(ImportProjectExtensionProps)' != 'false' and exists('$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.props')" />
4+
<PropertyGroup>
5+
<OutputType>WinExe</OutputType>
6+
<PublishDir>publish\</PublishDir>
7+
<SelfContained>false</SelfContained>
8+
<PublishSingleFile>true</PublishSingleFile>
9+
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<ApplicationIcon>../Divvun.Installer/divvun-logo-512.ico</ApplicationIcon>
12+
<Platform>x86</Platform>
13+
<RootNamespace>Divvun.Installer.OneClick</RootNamespace>
14+
<AssemblyName>Divvun.Installer.OneClick</AssemblyName>
15+
<TargetFramework>net8.0-windows</TargetFramework>
16+
<Nullable>enable</Nullable>
17+
<LangVersion>8.0</LangVersion>
18+
<WarningsAsErrors>CS8600;CS8602;CS8603</WarningsAsErrors>
19+
<UseWPF>true</UseWPF>
20+
</PropertyGroup>
21+
<PropertyGroup>
22+
<ApplicationManifest>app.manifest</ApplicationManifest>
23+
</PropertyGroup>
24+
<ItemGroup>
25+
<Resource Include="Resources\iso639-autonyms.tsv" />
26+
<None Include="app.manifest" />
27+
<None Include="Properties\Settings.settings">
28+
<Generator>SettingsSingleFileGenerator</Generator>
29+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
30+
</None>
31+
</ItemGroup>
32+
<ItemGroup>
33+
<None Include="App.config" />
34+
</ItemGroup>
35+
<ItemGroup>
36+
<ProjectReference Include="..\FlatBuffers\FlatBuffers.csproj" />
37+
<ProjectReference Include="..\Pahkat.Sdk.Rpc\Pahkat.Sdk.Rpc.csproj" />
38+
<ProjectReference Include="..\Pahkat.Sdk\Pahkat.Sdk.csproj" />
39+
</ItemGroup>
40+
<ItemGroup>
41+
<WCFMetadata Include="Connected Services\" />
42+
</ItemGroup>
43+
<ItemGroup>
44+
<PackageReference Include="CsvHelper">
45+
<Version>6.1.0</Version>
46+
</PackageReference>
47+
<PackageReference Include="Flurl">
48+
<Version>3.0.2</Version>
49+
</PackageReference>
50+
<PackageReference Include="Iterable">
51+
<Version>0.2.0</Version>
52+
</PackageReference>
53+
<PackageReference Include="Newtonsoft.Json">
54+
<Version>13.0.3</Version>
55+
</PackageReference>
56+
<PackageReference Include="Serilog" Version="2.9.0" />
57+
<PackageReference Include="Sentry" Version="3.11.1" />
58+
<PackageReference Include="Sentry.Serilog" Version="3.11.1" />
59+
<PackageReference Include="Serilog.Exceptions" Version="7.1.0" />
60+
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0-dev-00839" />
61+
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.2.0-dev-00747" />
62+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119">
63+
<PrivateAssets>all</PrivateAssets>
64+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
65+
</PackageReference>
66+
</ItemGroup>
67+
<ItemGroup>
68+
<Compile Update="Strings.Designer.cs">
69+
<DesignTime>True</DesignTime>
70+
<AutoGen>True</AutoGen>
71+
<DependentUpon>Strings.resx</DependentUpon>
72+
</Compile>
73+
</ItemGroup>
74+
<ItemGroup>
75+
<EmbeddedResource Update="Strings.resx">
76+
<Generator>PublicResXFileCodeGenerator</Generator>
77+
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
78+
</EmbeddedResource>
79+
</ItemGroup>
80+
<Import Project="$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.targets" Condition=" '$(_TargetAssemblyProjectName)' != '' and '$(ImportProjectExtensionProps)' != 'false' and exists('$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.targets')" />
8281
</Project>

‎Divvun.Installer/Divvun.Installer.csproj

Lines changed: 111 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,116 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3-
<Import Project="$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.props" Condition=" '$(_TargetAssemblyProjectName)' != '' and '$(ImportProjectExtensionProps)' != 'false' and exists('$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.props')" />
4-
<PropertyGroup>
5-
<OutputType>Exe</OutputType>
6-
<AppDesignerFolder>Properties</AppDesignerFolder>
7-
<Platform>x86</Platform>
8-
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
9-
<PlatformTarget>x86</PlatformTarget>
10-
<RootNamespace>Divvun.Installer</RootNamespace>
11-
<AssemblyName>DivvunManager</AssemblyName>
12-
<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
13-
<Nullable>enable</Nullable>
14-
<LangVersion>8.0</LangVersion>
15-
<WarningsAsErrors>CS8600;CS8602;CS8603</WarningsAsErrors>
16-
<UseWPF>true</UseWPF>
17-
<Platforms>AnyCPU;x86</Platforms>
18-
</PropertyGroup>
19-
<PropertyGroup>
20-
<ApplicationManifest>app.manifest</ApplicationManifest>
21-
</PropertyGroup>
22-
<PropertyGroup>
23-
<ApplicationIcon>divvun-logo-512.ico</ApplicationIcon>
24-
</PropertyGroup>
25-
<ItemGroup>
26-
<None Include="app.config" />
27-
<None Include="app.manifest">
28-
<SubType>Designer</SubType>
29-
</None>
30-
<Resource Include="Util\iso639-3_native.tsv" />
31-
</ItemGroup>
32-
<ItemGroup>
33-
<Compile Update="Strings.Designer.cs">
34-
<DesignTime>True</DesignTime>
35-
<AutoGen>True</AutoGen>
36-
<DependentUpon>Strings.resx</DependentUpon>
37-
</Compile>
38-
<EmbeddedResource Update="Strings.resx">
39-
<Generator>PublicResXFileCodeGenerator</Generator>
40-
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
41-
</EmbeddedResource>
42-
</ItemGroup>
43-
<ItemGroup>
44-
<Resource Include="UI\Main\icon-menu.png" />
45-
</ItemGroup>
46-
<ItemGroup>
47-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<Resource Include="UI\TaskbarIcon.ico" />
51-
</ItemGroup>
52-
<ItemGroup>
53-
<Resource Include="divvun-logo-512.ico" />
54-
</ItemGroup>
55-
<ItemGroup>
56-
<PackageReference Include="CefSharp.Common" Version="94.4.110" />
57-
<PackageReference Include="CefSharp.Wpf" Version="94.4.110" />
58-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133">
59-
<PrivateAssets>all</PrivateAssets>
60-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
61-
</PackageReference>
62-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
63-
<PackageReference Include="OneOf.Extended" Version="3.0.190" />
64-
<PackageReference Include="Serilog" Version="2.11.0-dev-01371" />
65-
<PackageReference Include="Serilog.Exceptions" Version="7.0.0" />
66-
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.2.0-dev-00752" />
67-
<PackageReference Include="System.Management" Version="6.0.0-rc.1.21451.13" />
68-
<PackageReference Include="System.Reactive" Version="4.4.1" />
69-
<PackageReference Include="System.Reactive.Observable.Aliases" Version="4.4.1" />
70-
</ItemGroup>
71-
<ItemGroup>
72-
<ProjectReference Include="..\FlatBuffers\FlatBuffers.csproj" />
73-
<ProjectReference Include="..\Pahkat.Sdk.Rpc\Pahkat.Sdk.Rpc.csproj" />
74-
<ProjectReference Include="..\Pahkat.Sdk\Pahkat.Sdk.csproj" />
75-
<PackageReference Include="Castle.Core" Version="4.4.1" />
76-
<PackageReference Include="Sentry" Version="3.9.2" />
77-
<PackageReference Include="Sentry.Serilog" Version="3.9.2" />
78-
<PackageReference Include="Hardcodet.NotifyIcon.Wpf.NetCore" Version="1.0.18" />
79-
<PackageReference Include="SingleInstanceCore" Version="1.0.0" />
80-
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
81-
<PackageReference Include="Serilog.Sinks.File.GZip" Version="1.0.2" />
82-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1-dev-00876" />
83-
<PackageReference Include="CsvHelper" Version="6.1.0" />
84-
<PackageReference Include="JetBrains.Annotations" Version="2021.2.0" />
85-
<PackageReference Include="ModernWpfUI" Version="0.9.4" />
86-
<PackageReference Include="NUnit" Version="3.13.2" />
87-
</ItemGroup>
88-
89-
<ItemGroup>
90-
<!-- TODO: These updates are currently required because CefSharp.Wpf specifies
3+
<Import Project="$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.props" Condition=" '$(_TargetAssemblyProjectName)' != '' and '$(ImportProjectExtensionProps)' != 'false' and exists('$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.props')" />
4+
<PropertyGroup>
5+
<OutputType>Exe</OutputType>
6+
<AppDesignerFolder>Properties</AppDesignerFolder>
7+
<Platform>x86</Platform>
8+
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
9+
<PlatformTarget>x86</PlatformTarget>
10+
<RootNamespace>Divvun.Installer</RootNamespace>
11+
<AssemblyName>DivvunManager</AssemblyName>
12+
<TargetFramework>net8.0-windows</TargetFramework>
13+
<Nullable>enable</Nullable>
14+
<LangVersion>8.0</LangVersion>
15+
<WarningsAsErrors>CS8600;CS8602;CS8603</WarningsAsErrors>
16+
<UseWPF>true</UseWPF>
17+
<Platforms>AnyCPU;x86</Platforms>
18+
</PropertyGroup>
19+
<PropertyGroup>
20+
<ApplicationManifest>app.manifest</ApplicationManifest>
21+
</PropertyGroup>
22+
<PropertyGroup>
23+
<ApplicationIcon>divvun-logo-512.ico</ApplicationIcon>
24+
</PropertyGroup>
25+
<ItemGroup>
26+
<None Include="app.config" />
27+
<None Include="app.manifest">
28+
<SubType>Designer</SubType>
29+
</None>
30+
<Resource Include="Util\iso639-3_native.tsv" />
31+
</ItemGroup>
32+
<ItemGroup>
33+
<Compile Update="Strings.Designer.cs">
34+
<DesignTime>True</DesignTime>
35+
<AutoGen>True</AutoGen>
36+
<DependentUpon>Strings.resx</DependentUpon>
37+
</Compile>
38+
<EmbeddedResource Update="Strings.resx">
39+
<Generator>PublicResXFileCodeGenerator</Generator>
40+
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
41+
</EmbeddedResource>
42+
</ItemGroup>
43+
<ItemGroup>
44+
<Resource Include="UI\Main\icon-menu.png" />
45+
</ItemGroup>
46+
<ItemGroup>
47+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
48+
</ItemGroup>
49+
<ItemGroup>
50+
<Resource Include="UI\TaskbarIcon.ico" />
51+
</ItemGroup>
52+
<ItemGroup>
53+
<Resource Include="divvun-logo-512.ico" />
54+
</ItemGroup>
55+
<ItemGroup>
56+
<PackageReference Include="CefSharp.Common" Version="94.4.110" />
57+
<PackageReference Include="CefSharp.Wpf" Version="94.4.110" />
58+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133">
59+
<PrivateAssets>all</PrivateAssets>
60+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
61+
</PackageReference>
62+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
63+
<PackageReference Include="OneOf.Extended" Version="3.0.190" />
64+
<PackageReference Include="Serilog" Version="2.11.0-dev-01371" />
65+
<PackageReference Include="Serilog.Exceptions" Version="7.0.0" />
66+
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.2.0-dev-00752" />
67+
<PackageReference Include="System.Management" Version="8.0.0" />
68+
<PackageReference Include="System.Reactive" Version="4.4.1" />
69+
<PackageReference Include="System.Reactive.Observable.Aliases" Version="4.4.1" />
70+
</ItemGroup>
71+
<ItemGroup>
72+
<ProjectReference Include="..\FlatBuffers\FlatBuffers.csproj" />
73+
<ProjectReference Include="..\Pahkat.Sdk.Rpc\Pahkat.Sdk.Rpc.csproj" />
74+
<ProjectReference Include="..\Pahkat.Sdk\Pahkat.Sdk.csproj" />
75+
<PackageReference Include="Castle.Core" Version="4.4.1" />
76+
<PackageReference Include="Sentry" Version="3.9.2" />
77+
<PackageReference Include="Sentry.Serilog" Version="3.9.2" />
78+
<PackageReference Include="Hardcodet.NotifyIcon.Wpf.NetCore" Version="1.0.18" />
79+
<PackageReference Include="SingleInstanceCore" Version="1.0.0" />
80+
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
81+
<PackageReference Include="Serilog.Sinks.File.GZip" Version="1.0.2" />
82+
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1-dev-00876" />
83+
<PackageReference Include="CsvHelper" Version="6.1.0" />
84+
<PackageReference Include="JetBrains.Annotations" Version="2021.2.0" />
85+
<PackageReference Include="ModernWpfUI" Version="0.9.4" />
86+
<PackageReference Include="NUnit" Version="3.13.2" />
87+
</ItemGroup>
88+
<ItemGroup>
89+
<!-- TODO: These updates are currently required because CefSharp.Wpf specifies
9190
<Private>false</Private>, which means these libraries will not be specified in
9291
the .deps.json file, and so the CoreCLR wouldn't load these. -->
93-
<Reference Update="CefSharp">
94-
<Private>true</Private>
95-
</Reference>
96-
<Reference Update="CefSharp.Core">
97-
<Private>true</Private>
98-
</Reference>
99-
<Reference Update="CefSharp.Wpf">
100-
<Private>true</Private>
101-
</Reference>
102-
</ItemGroup>
103-
<ItemGroup>
104-
<Compile Update="Strings.Designer.cs">
105-
<DesignTime>True</DesignTime>
106-
<AutoGen>True</AutoGen>
107-
<DependentUpon>Strings.resx</DependentUpon>
108-
</Compile>
109-
</ItemGroup>
110-
<ItemGroup>
111-
<EmbeddedResource Update="Strings.resx">
112-
<Generator>PublicResXFileCodeGenerator</Generator>
113-
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
114-
</EmbeddedResource>
115-
</ItemGroup>
116-
117-
<Import Project="$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.targets" Condition=" '$(_TargetAssemblyProjectName)' != '' and '$(ImportProjectExtensionProps)' != 'false' and exists('$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.targets')" />
92+
<Reference Update="CefSharp">
93+
<Private>true</Private>
94+
</Reference>
95+
<Reference Update="CefSharp.Core">
96+
<Private>true</Private>
97+
</Reference>
98+
<Reference Update="CefSharp.Wpf">
99+
<Private>true</Private>
100+
</Reference>
101+
</ItemGroup>
102+
<ItemGroup>
103+
<Compile Update="Strings.Designer.cs">
104+
<DesignTime>True</DesignTime>
105+
<AutoGen>True</AutoGen>
106+
<DependentUpon>Strings.resx</DependentUpon>
107+
</Compile>
108+
</ItemGroup>
109+
<ItemGroup>
110+
<EmbeddedResource Update="Strings.resx">
111+
<Generator>PublicResXFileCodeGenerator</Generator>
112+
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
113+
</EmbeddedResource>
114+
</ItemGroup>
115+
<Import Project="$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.targets" Condition=" '$(_TargetAssemblyProjectName)' != '' and '$(ImportProjectExtensionProps)' != 'false' and exists('$(BaseIntermediateOutputPath)$(_TargetAssemblyProjectName)$(MSBuildProjectExtension).nuget.g.targets')" />
118116
</Project>

0 commit comments

Comments
 (0)