Skip to content

Commit 6a17436

Browse files
BobLdBobLd
authored
Update net40 and net45 to net452 and remove Net40 compatibility tools (#1839)
1 parent 3d4a9c1 commit 6a17436

23 files changed

Lines changed: 79 additions & 240 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
77
- Add LineThickness property to TrackerControl (#1831)
88

99
### Changed
10+
- Update net40 and net45 to net452 (#1835)
1011

1112
### Removed
1213

‎CONTRIBUTORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Auriou
1717
Bartłomiej Szypelow <bszypelow@users.noreply.github.com>
1818
benjaminrupp
1919
Benoit Blanchon <>
20+
BobLd
2021
br
2122
brantheman
2223
Brannon King

‎Source/Examples/ExampleLibrary/ExampleLibrary.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>netstandard1.0;netstandard2.0;net45</TargetFrameworks>
4+
<TargetFrameworks>netstandard1.0;netstandard2.0;net452</TargetFrameworks>
55
<PackageId>OxyPlot.ExampleLibrary</PackageId>
66
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
77
<Description>Example models for OxyPlot.</Description>

‎Source/Examples/WPF/SimpleDemo/SimpleDemo.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net45;net40;netcoreapp3.1</TargetFrameworks>
3+
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
44
<UseWPF>true</UseWPF>
55
<OutputType>WinExe</OutputType>
66
</PropertyGroup>

‎Source/Examples/WindowsForms/WindowsFormsDemo/WindowsFormsDemo.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net45;net40;netcoreapp3.1</TargetFrameworks>
3+
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
44
<UseWindowsForms>true</UseWindowsForms>
55
<OutputType>WinExe</OutputType>
66
</PropertyGroup>

‎Source/OxyPlot.CI.sln‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.28803.352
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.32112.339
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OxyPlot.Wpf", "OxyPlot.Wpf\OxyPlot.Wpf.csproj", "{698CCD8E-ADCC-4565-8517-5EDD36F07155}"
77
EndProject
@@ -54,6 +54,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OxyPlot.ImageSharp.Tests",
5454
EndProject
5555
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfExamples", "Examples\WPF\WpfExamples\WpfExamples.csproj", "{5F0234B5-EF4C-4314-AE01-A59722B92C39}"
5656
EndProject
57+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerformanceTest", "Examples\PerformanceTest\PerformanceTest.csproj", "{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}"
58+
EndProject
5759
Global
5860
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5961
Debug|Any CPU = Debug|Any CPU
@@ -473,6 +475,30 @@ Global
473475
{5F0234B5-EF4C-4314-AE01-A59722B92C39}.Release|x64.Build.0 = Release|Any CPU
474476
{5F0234B5-EF4C-4314-AE01-A59722B92C39}.Release|x86.ActiveCfg = Release|Any CPU
475477
{5F0234B5-EF4C-4314-AE01-A59722B92C39}.Release|x86.Build.0 = Release|Any CPU
478+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
479+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
480+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Debug|ARM.ActiveCfg = Debug|Any CPU
481+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Debug|ARM.Build.0 = Debug|Any CPU
482+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Debug|iPhone.ActiveCfg = Debug|Any CPU
483+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Debug|iPhone.Build.0 = Debug|Any CPU
484+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
485+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
486+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Debug|x64.ActiveCfg = Debug|Any CPU
487+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Debug|x64.Build.0 = Debug|Any CPU
488+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Debug|x86.ActiveCfg = Debug|Any CPU
489+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Debug|x86.Build.0 = Debug|Any CPU
490+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
491+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Release|Any CPU.Build.0 = Release|Any CPU
492+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Release|ARM.ActiveCfg = Release|Any CPU
493+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Release|ARM.Build.0 = Release|Any CPU
494+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Release|iPhone.ActiveCfg = Release|Any CPU
495+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Release|iPhone.Build.0 = Release|Any CPU
496+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
497+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
498+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Release|x64.ActiveCfg = Release|Any CPU
499+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Release|x64.Build.0 = Release|Any CPU
500+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Release|x86.ActiveCfg = Release|Any CPU
501+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96}.Release|x86.Build.0 = Release|Any CPU
476502
EndGlobalSection
477503
GlobalSection(SolutionProperties) = preSolution
478504
HideSolutionNode = FALSE
@@ -488,6 +514,7 @@ Global
488514
{E58D0F70-2E8C-44C9-B16E-CBB30FC9FF73} = {215581EE-098A-488B-91CE-980D94EED5A2}
489515
{47409F61-4C0C-4A1A-812D-DDED0DA319A0} = {215581EE-098A-488B-91CE-980D94EED5A2}
490516
{5F0234B5-EF4C-4314-AE01-A59722B92C39} = {E124D189-92DF-4A3C-BFA9-6687F4878C12}
517+
{0295BD17-3E41-4ACA-9AFD-B82C5AA02A96} = {E124D189-92DF-4A3C-BFA9-6687F4878C12}
491518
EndGlobalSection
492519
GlobalSection(ExtensibilityGlobals) = postSolution
493520
SolutionGuid = {282C7D1F-6AA7-4D54-8C6C-C83C2927F9FE}

‎Source/OxyPlot.SkiaSharp.Wpf/OxyPlot.SkiaSharp.Wpf.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
3+
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
44
<UseWPF>true</UseWPF>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Description>OxyPlot is a plotting library for .NET. This package targets WPF applications and uses the SkiaSharp renderer.</Description>

‎Source/OxyPlot.SkiaSharp/OxyPlot.SkiaSharp.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
<PropertyGroup>
33
<LangVersion>8</LangVersion>
4-
<TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net452;netstandard1.3;netstandard2.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Copyright>Copyright (c) 2020 OxyPlot contributors</Copyright>
77
<Authors>OxyPlot contributors</Authors>

‎Source/OxyPlot.WindowsForms/OxyPlot.WindowsForms.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net45;net40;netcoreapp3.1</TargetFrameworks>
3+
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
44
<UseWindowsForms>true</UseWindowsForms>
55
<Description>OxyPlot is a plotting library for .NET. This package targets Windows Forms applications.</Description>
66
<Copyright>Copyright (c) 2014 OxyPlot contributors</Copyright>
@@ -20,7 +20,7 @@
2020
<ProjectReference Include="..\OxyPlot\OxyPlot.csproj" />
2121
</ItemGroup>
2222
<ItemGroup>
23-
<None Include="..\..\Icons\OxyPlot_128.png" Pack="true" PackagePath="\"/>
23+
<None Include="..\..\Icons\OxyPlot_128.png" Pack="true" PackagePath="\" />
2424
</ItemGroup>
2525
<ItemGroup>
2626
<None Include="OxyPlot.WindowsForms.snk" />

‎Source/OxyPlot.Wpf.Shared/OxyPlot.Wpf.Shared.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net45;net40;netcoreapp3.1</TargetFrameworks>
3+
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
44
<UseWPF>true</UseWPF>
55
<LangVersion>8</LangVersion>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

0 commit comments

Comments
 (0)