Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from netcoreapp3.0 to net5.0-windows #214

Merged
merged 2 commits into from
Apr 5, 2021
Merged

Migrate from netcoreapp3.0 to net5.0-windows #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a00783b
Migrate from netcoreapp3.0 to net5.0-windows
mgnslndh Dec 1, 2020
945a659
Added back netcoreapp3.0 TFM and fixed various .NET Framework TFM
mgnslndh Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net452</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0-windows;net452</TargetFrameworks>
<ProjectGuid>{FE4E16A2-876A-4356-9974-8A89C50B2A5A}</ProjectGuid>
<RootNamespace>AvalonDockTest</RootNamespace>
<AssemblyName>AvalonDockTest</AssemblyName>
Expand Down
4 changes: 2 additions & 2 deletions source/CaliburnDockTestApp/CaliburnDockTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>netcoreapp3.0;net4.5.2</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0-windows;net452</TargetFrameworks>
<UseWPF>true</UseWPF>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion source/Components/AvalonDock.Themes.Aero/AvalonDock.Themes.Aero.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<RootNamespace>AvalonDock.Themes</RootNamespace>
<TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0-windows;net40</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion source/Components/AvalonDock.Themes.Expression/AvalonDock.Themes.Expression.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<RootNamespace>AvalonDock.Themes</RootNamespace>
<TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0-windows;net40</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand Down
4 changes: 2 additions & 2 deletions source/Components/AvalonDock.Themes.Metro/AvalonDock.Themes.Metro.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<RootNamespace>AvalonDock.Themes</RootNamespace>
<TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0-windows;net40</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand All @@ -19,7 +19,7 @@
<Authors>https://github.com/Dirkster99/AvalonDock</Authors>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>

<ItemGroup>
<Resource Include="**\*.png" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/Components/AvalonDock.Themes.VS2010/AvalonDock.Themes.VS2010.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<RootNamespace>AvalonDock.Themes</RootNamespace>
<TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0-windows;net40</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion source/Components/AvalonDock.Themes.VS2013/AvalonDock.Themes.VS2013.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<RootNamespace>AvalonDock.Themes</RootNamespace>
<TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0-windows;net40</TargetFrameworks>
<UseWPF>true</UseWPF>
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand Down
4 changes: 2 additions & 2 deletions source/Components/AvalonDock/AvalonDock.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<RootNamespace>AvalonDock</RootNamespace>
<TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0-windows;net40</TargetFrameworks>
<UseWPF>true</UseWPF>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
Expand All @@ -19,7 +19,7 @@
<Authors>https://github.com/Dirkster99/AvalonDock</Authors>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.0|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net.5.0-windows|AnyCPU'">
<DefineConstants />
</PropertyGroup>

Expand Down
14 changes: 10 additions & 4 deletions source/MLibTest/MLibTest/MLibTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>netcoreapp3.0;net4.5.2</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0-windows;net452</TargetFrameworks>
<UseWPF>true</UseWPF>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.0|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net5.0-windows|AnyCPU'">
<DefineConstants />
</PropertyGroup>

Expand All @@ -15,12 +15,18 @@
<None Remove="Demos\Images\property-blue.png" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
<Version>1.1.19</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
<Version>1.1.19</Version>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dirkster.ColorPickerLib" Version="1.6.0" />
<PackageReference Include="Dirkster.MLib" Version="1.3.1.2" />
Expand Down
4 changes: 2 additions & 2 deletions source/MLibTest/MLibTest_Components/ServiceLocator/ServiceLocator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net4.5</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0;net45</TargetFrameworks>
</PropertyGroup>

</Project>
12 changes: 9 additions & 3 deletions source/MLibTest/MLibTest_Components/Settings/SettingsModel/SettingsModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net4.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="System.Security.Cryptography.ProtectedData">
<Version>4.6.0</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net4.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Security.Cryptography.ProtectedData">
<Version>4.6.0</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net40'">
<Reference Include="System.Security"/>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions source/MVVMTestApp/MVVMTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0-windows;net40</TargetFrameworks>
<UseWPF>true</UseWPF>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions source/TestApp/TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<RootNamespace>TestApp</RootNamespace>
<TargetFrameworks>netcoreapp3.0;net40</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0-windows;net40</TargetFrameworks>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<ApplicationIcon />
Expand Down
4 changes: 2 additions & 2 deletions source/WinFormsTestApp/WinFormsTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>netcoreapp3.0;net4.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;net5.0-windows;net40</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>true</UseWPF>
<StartupObject>AvalonDock.WinFormsTestApp.Program</StartupObject>
Expand Down