Skip to content

Commit ca0db1b

Browse files
gep13gep13
committed
(#841) Change .NET Framework target to be 4.8
This will allow us to add new functionality that has been requested in Chocolatey GUI, for example, support for high DPI.
1 parent 309a778 commit ca0db1b

File tree

14 files changed

+215
-177
lines changed

14 files changed

+215
-177
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ You can find information about Chocolatey GUI here: [https://docs.chocolatey.org
4242

4343
### Requirements
4444

45-
* .NET Framework 4.5.2
45+
* .NET Framework 4.8
4646
* Should work on all Windows Operating Systems from Windows 7 SP1 and above, and Windows Server 2008 R2 SP1 and above
4747

4848
### License / Credits

‎Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj

+50-36
Large diffs are not rendered by default.

‎Source/ChocolateyGui.Common.Windows/app.config

+9-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414
<assemblyIdentity name="Markdig.Signed" publicKeyToken="870da25a133885f8" culture="neutral" />
1515
<bindingRedirect oldVersion="0.0.0.0-0.23.0.0" newVersion="0.23.0.0" />
1616
</dependentAssembly>
17+
<dependentAssembly>
18+
<assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
24+
</dependentAssembly>
1725
</assemblyBinding>
1826
</runtime>
19-
</configuration>
27+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>

‎Source/ChocolateyGui.Common.Windows/packages.config

+35-34
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,50 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Autofac" version="4.6.1" targetFramework="net452" />
4-
<package id="AutoMapper" version="7.0.1" targetFramework="net452" />
4+
<package id="AutoMapper" version="7.0.1" targetFramework="net48" />
55
<package id="BuildTools.FxCop" version="1.0.1" targetFramework="net40" />
6-
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net40" requireReinstallation="true" />
7-
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net40" requireReinstallation="true" />
6+
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net48" />
7+
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net48" />
88
<package id="chocolatey.lib" version="0.10.15" targetFramework="net452" />
9-
<package id="ControlzEx" version="4.4.0" targetFramework="net452" />
10-
<package id="Fizzler" version="1.2.0" targetFramework="net452" />
11-
<package id="HarfBuzzSharp" version="2.6.1.4" targetFramework="net452" />
9+
<package id="ControlzEx" version="4.4.0" targetFramework="net48" />
10+
<package id="Fizzler" version="1.2.0" targetFramework="net48" />
11+
<package id="HarfBuzzSharp" version="2.6.1.4" targetFramework="net48" />
1212
<package id="LiteDB" version="5.0.5" targetFramework="net452" />
1313
<package id="log4net" version="2.0.3" targetFramework="net452" />
14-
<package id="MahApps.Metro" version="2.4.4" targetFramework="net452" />
15-
<package id="MahApps.Metro.IconPacks.BoxIcons" version="4.8.0" targetFramework="net452" />
16-
<package id="MahApps.Metro.IconPacks.Entypo" version="4.8.0" targetFramework="net452" />
17-
<package id="MahApps.Metro.IconPacks.FontAwesome" version="4.8.0" targetFramework="net452" />
18-
<package id="MahApps.Metro.IconPacks.Modern" version="4.8.0" targetFramework="net452" />
19-
<package id="MahApps.Metro.IconPacks.Octicons" version="4.8.0" targetFramework="net452" />
20-
<package id="Markdig.Signed" version="0.23.0" targetFramework="net452" />
21-
<package id="Markdig.Wpf.Signed" version="0.5.0.1" targetFramework="net452" />
14+
<package id="MahApps.Metro" version="2.4.4" targetFramework="net48" />
15+
<package id="MahApps.Metro.IconPacks.BoxIcons" version="4.8.0" targetFramework="net48" />
16+
<package id="MahApps.Metro.IconPacks.Entypo" version="4.8.0" targetFramework="net48" />
17+
<package id="MahApps.Metro.IconPacks.FontAwesome" version="4.8.0" targetFramework="net48" />
18+
<package id="MahApps.Metro.IconPacks.Modern" version="4.8.0" targetFramework="net48" />
19+
<package id="MahApps.Metro.IconPacks.Octicons" version="4.8.0" targetFramework="net48" />
20+
<package id="Markdig.Signed" version="0.23.0" targetFramework="net48" />
21+
<package id="Markdig.Wpf.Signed" version="0.5.0.1" targetFramework="net48" />
2222
<package id="Microsoft.NETCore.Platforms" version="3.1.0" targetFramework="net452" />
2323
<package id="Microsoft.VisualStudio.Threading" version="15.4.4" targetFramework="net452" />
2424
<package id="Microsoft.VisualStudio.Validation" version="15.3.15" targetFramework="net452" />
2525
<package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.19" targetFramework="net452" />
26-
<package id="NETStandard.Library" version="2.0.3" targetFramework="net452" />
27-
<package id="Serilog" version="2.5.0" targetFramework="net452" />
28-
<package id="Serilog.Sinks.Async" version="1.1.0" targetFramework="net452" />
29-
<package id="Serilog.Sinks.File" version="3.2.0" targetFramework="net452" />
30-
<package id="Serilog.Sinks.RollingFile" version="3.3.0" targetFramework="net452" />
31-
<package id="SkiaSharp" version="1.68.3" targetFramework="net452" />
32-
<package id="SkiaSharp.HarfBuzz" version="1.68.3" targetFramework="net452" />
26+
<package id="NETStandard.Library" version="2.0.3" targetFramework="net48" />
27+
<package id="Serilog" version="2.5.0" targetFramework="net48" />
28+
<package id="Serilog.Sinks.Async" version="1.1.0" targetFramework="net48" />
29+
<package id="Serilog.Sinks.File" version="3.2.0" targetFramework="net48" />
30+
<package id="Serilog.Sinks.RollingFile" version="3.3.0" targetFramework="net48" />
31+
<package id="SkiaSharp" version="1.68.3" targetFramework="net48" />
32+
<package id="SkiaSharp.HarfBuzz" version="1.68.3" targetFramework="net48" />
3333
<package id="Splat" version="2.0.0" targetFramework="net452" />
34-
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net40" developmentDependency="true" />
35-
<package id="Svg.Custom" version="0.3.0" targetFramework="net452" />
36-
<package id="Svg.Skia" version="0.3.0" targetFramework="net452" />
37-
<package id="System.Buffers" version="4.5.1" targetFramework="net452" />
34+
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net48" developmentDependency="true" />
35+
<package id="Svg.Custom" version="0.3.0" targetFramework="net48" />
36+
<package id="Svg.Skia" version="0.3.0" targetFramework="net48" />
37+
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
3838
<package id="System.Diagnostics.Contracts" version="4.3.0" targetFramework="net452" />
39-
<package id="System.Memory" version="4.5.4" targetFramework="net452" />
40-
<package id="System.Reactive" version="3.1.1" targetFramework="net452" />
41-
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net452" />
42-
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net452" />
43-
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net452" />
44-
<package id="System.Reactive.PlatformServices" version="3.1.1" targetFramework="net452" />
45-
<package id="System.Reactive.Windows.Threading" version="3.1.1" targetFramework="net452" />
46-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net452" />
39+
<package id="System.Memory" version="4.5.4" targetFramework="net48" />
40+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
41+
<package id="System.Reactive" version="3.1.1" targetFramework="net48" />
42+
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net48" />
43+
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net48" />
44+
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net48" />
45+
<package id="System.Reactive.PlatformServices" version="3.1.1" targetFramework="net48" />
46+
<package id="System.Reactive.Windows.Threading" version="3.1.1" targetFramework="net48" />
47+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net48" />
4748
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net452" />
48-
<package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
49+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
4950
</packages>

‎Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj

+7-6
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>ChocolateyGui.Common</RootNamespace>
1111
<AssemblyName>ChocolateyGui.Common</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
1515
<BuildToolsFxCopVersion>1.0.1</BuildToolsFxCopVersion>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -68,7 +69,7 @@
6869
<HintPath>..\packages\Microsoft.VisualStudio.Validation.15.3.32\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
6970
</Reference>
7071
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
71-
<HintPath>..\packages\Serilog.2.5.0\lib\net45\Serilog.dll</HintPath>
72+
<HintPath>..\packages\Serilog.2.5.0\lib\net46\Serilog.dll</HintPath>
7273
</Reference>
7374
<Reference Include="Serilog.Formatting.Compact, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
7475
<HintPath>..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll</HintPath>
@@ -94,7 +95,7 @@
9495
<Reference Include="System.Runtime.Serialization" />
9596
<Reference Include="System.Security" />
9697
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
97-
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
98+
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
9899
</Reference>
99100
<Reference Include="System.Xml.Linq" />
100101
<Reference Include="System.Data.DataSetExtensions" />
@@ -214,11 +215,11 @@
214215
</CodeAnalysisDictionary>
215216
</ItemGroup>
216217
<ItemGroup>
217-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
218-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
218+
<SourceRoot Include="$(MSBuildThisFileDirectory)/../" />
219219
</ItemGroup>
220220
<ItemGroup>
221-
<SourceRoot Include="$(MSBuildThisFileDirectory)/../" />
221+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
222+
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.2\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
222223
</ItemGroup>
223224
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
224225
</Project>

‎Source/ChocolateyGui.Common/packages.config

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Autofac" version="4.6.1" targetFramework="net452" />
4-
<package id="AutoMapper" version="7.0.1" targetFramework="net452" />
4+
<package id="AutoMapper" version="7.0.1" targetFramework="net48" />
55
<package id="BuildTools.FxCop" version="1.0.1" targetFramework="net452" />
66
<package id="chocolatey.lib" version="0.10.15" targetFramework="net452" />
77
<package id="LiteDB" version="5.0.5" targetFramework="net452" />
88
<package id="log4net" version="2.0.3" targetFramework="net452" />
99
<package id="Microsoft.VisualStudio.Threading" version="15.4.4" targetFramework="net452" />
1010
<package id="Microsoft.VisualStudio.Validation" version="15.3.32" targetFramework="net452" />
11-
<package id="Serilog" version="2.5.0" targetFramework="net452" />
12-
<package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net452" />
13-
<package id="Serilog.Sinks.Async" version="1.1.0" targetFramework="net452" />
14-
<package id="Serilog.Sinks.Console" version="3.1.0" targetFramework="net452" />
15-
<package id="Serilog.Sinks.File" version="3.2.0" targetFramework="net452" />
16-
<package id="Serilog.Sinks.PeriodicBatching" version="2.1.1" targetFramework="net452" />
17-
<package id="Serilog.Sinks.RollingFile" version="3.3.0" targetFramework="net452" />
18-
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net452" developmentDependency="true" />
19-
<package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
11+
<package id="Serilog" version="2.5.0" targetFramework="net48" />
12+
<package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net48" />
13+
<package id="Serilog.Sinks.Async" version="1.1.0" targetFramework="net48" />
14+
<package id="Serilog.Sinks.Console" version="3.1.0" targetFramework="net48" />
15+
<package id="Serilog.Sinks.File" version="3.2.0" targetFramework="net48" />
16+
<package id="Serilog.Sinks.PeriodicBatching" version="2.1.1" targetFramework="net48" />
17+
<package id="Serilog.Sinks.RollingFile" version="3.3.0" targetFramework="net48" />
18+
<package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net48" developmentDependency="true" />
19+
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
2020
</packages>

0 commit comments

Comments
 (0)