Merge pull request #93 from RadicalFx/upgrade-to-net-core-3.0

Upgrade to .NET Core 3.0
RadicalFx · Dec 1, 2019 · 8ebc3d5 · 8ebc3d5
2 parents 8ef0aef + c9b880c
commit 8ebc3d5
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 47 deletions.
diff --git a/.required-sdk b/.required-sdk
@@ -0,0 +1 @@
+3.0.100
diff --git a/appveyor.yml b/appveyor.yml
@@ -25,8 +25,7 @@ artifacts:
 before_build:
   - nuget restore .\src\Radical.Windows.sln
 
-build:
-  project: src\Radical.Windows.sln
-  verbosity: minimal
+build_script:
+  - '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe" .\src\Radical.Windows.sln /Build Release'
 
 deploy: off
diff --git a/src/Radical.Windows.Tests/Radical.Windows.Tests.csproj b/src/Radical.Windows.Tests/Radical.Windows.Tests.csproj
@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net462</TargetFrameworks>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Radical.Windows/Behaviors/ListBoxBehaviors/ManipulationBoundaryFeedback.cs b/src/Radical.Windows/Behaviors/ListBoxBehaviors/ManipulationBoundaryFeedback.cs
@@ -1,5 +1,5 @@
-using System.Windows.Controls;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
+using System.Windows.Controls;
 
 namespace Radical.Windows.Behaviors
 {

diff --git a/src/Radical.Windows/Behaviors/RadicalBehavior (Generic).cs b/src/Radical.Windows/Behaviors/RadicalBehavior (Generic).cs
@@ -1,6 +1,6 @@
 using System;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 namespace Radical.Windows.Behaviors
 {

diff --git a/src/Radical.Windows/Behaviors/TextBox Behaviors/DisableUndoManagerBehavior.cs b/src/Radical.Windows/Behaviors/TextBox Behaviors/DisableUndoManagerBehavior.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 namespace Radical.Windows.Behaviors
 {

diff --git a/src/Radical.Windows/Behaviors/WindowControlBoxBehavior.cs b/src/Radical.Windows/Behaviors/WindowControlBoxBehavior.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using System.Windows.Interop;
 
 namespace Radical.Windows.Behaviors

diff --git a/src/Radical.Windows/Radical.Windows.csproj b/src/Radical.Windows/Radical.Windows.csproj
@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -21,7 +22,7 @@
     <MinVerMinimumMajorMinor>2</MinVerMinimumMajorMinor>
   </PropertyGroup>
 
-  <Target Name="ApVeyorPullRequestsTarget" AfterTargets="MinVer" Condition="'$(APPVEYOR_PULL_REQUEST_NUMBER)' != ''">
+  <Target Name="AppVeyorPullRequestsTarget" AfterTargets="MinVer" Condition="'$(APPVEYOR_PULL_REQUEST_NUMBER)' != ''">
     <PropertyGroup>
       <PackageVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)-PR.$(APPVEYOR_PULL_REQUEST_NUMBER).$(MinVerPreRelease)</PackageVersion>
       <PackageVersion Condition="'$(MinVerBuildMetadata)' != ''">$(PackageVersion)+$(MinVerBuildMetadata)</PackageVersion>
@@ -30,47 +31,16 @@
   </Target>
 
   <ItemGroup>
-    <None Remove="Behaviors\AutoComplete\AutoComplete.xaml" />
-    <None Remove="Resources\Effects\GrayscaleEffect.ps" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Expression.Blend.Sdk" Version="[1.0.2]" />
     <PackageReference Include="MinVer" Version="2.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Radical" Version="[2.0.0-Alpha.1,3.0.0)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Include="Behaviors\AutoComplete\AutoComplete.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="PresentationFramework.Aero" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="UIAutomationProvider" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Resource Include="Resources\Effects\GrayscaleEffect.ps" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Behaviors\AutoComplete\AutoComplete.xaml.cs">
-      <DependentUpon>AutoComplete.xaml</DependentUpon>
-    </Compile>
+    <PackageReference Include="Radical" Version="2.0.0-Beta.1" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.3" />
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="if exist &quot;$(DXSDK_DIR)Utilities\Bin\x86\fxc.exe&quot; &quot;$(DXSDK_DIR)Utilities\Bin\x86\fxc.exe&quot; /T ps_2_0 /E main /Fo&quot;$(ProjectDir)Resources\Effects\GrayscaleEffect.ps&quot; &quot;$(ProjectDir)Resources\Effects\GrayscaleEffect.fx&quot;" />
   </Target>
 
-</Project>
+</Project>