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

Jump to bottom

Upgrade to .NET Core 3.0 #93

Merged
merged 13 commits into from
Dec 1, 2019
Merged

Upgrade to .NET Core 3.0 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9f1da34
Requires NET Core 3 on build agents
mauroservienti Sep 26, 2019
8abb198
Move projects to NET Core 3 and update packages.
mauroservienti Sep 26, 2019
c2ba77f
Add Microsoft.Xaml.Behaviors.Wpf nuget package
mauroservienti Oct 19, 2019
9bfc9a7
What a merge de merge... :)
mauroservienti Oct 19, 2019
287bfdb
Adjust to new using Microsoft.Xaml.Behaviors namespace
mauroservienti Oct 19, 2019
c1944c3
remove shitty EnableDefaultCompileItems
mauroservienti Oct 31, 2019
e76500a
Merge branch 'master' into upgrade-to-net-core-3.0
mauroservienti Oct 31, 2019
a3ade07
Try to use VS to build
mauroservienti Nov 29, 2019
20043c3
full path to devenv
mauroservienti Nov 29, 2019
692dadf
uhm..
mauroservienti Nov 29, 2019
038d72a
grrrr
mauroservienti Nov 29, 2019
d866738
last grrrrr
mauroservienti Nov 29, 2019
c9b880c
Merge branch 'master' into upgrade-to-net-core-3.0
mauroservienti Nov 30, 2019
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
1 change: 1 addition & 0 deletions .required-sdk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0.100
5 changes: 2 additions & 3 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions src/Radical.Windows.Tests/Radical.Windows.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/Radical.Windows/Behaviors/ListBoxBehaviors/ManipulationBoundaryFeedback.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Windows.Controls;
using System.Windows.Interactivity;
using Microsoft.Xaml.Behaviors;
using System.Windows.Controls;

namespace Radical.Windows.Behaviors
{
Expand Down
2 changes: 1 addition & 1 deletion src/Radical.Windows/Behaviors/RadicalBehavior (Generic).cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Windows;
using System.Windows.Interactivity;
using Microsoft.Xaml.Behaviors;

namespace Radical.Windows.Behaviors
{
Expand Down
2 changes: 1 addition & 1 deletion src/Radical.Windows/Behaviors/TextBox Behaviors/DisableUndoManagerBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Interactivity;
using Microsoft.Xaml.Behaviors;

namespace Radical.Windows.Behaviors
{
Expand Down
2 changes: 1 addition & 1 deletion src/Radical.Windows/Behaviors/WindowControlBoxBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
44 changes: 7 additions & 37 deletions src/Radical.Windows/Radical.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand All @@ -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>