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

Update WPF to .NET 5 #2250

Merged
merged 13 commits into from
Jan 26, 2021
Merged

Update WPF to .NET 5 #2250

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
745d701
updating to .net5
brianlagunas Nov 12, 2020
dc29e96
updated test projects to net472
brianlagunas Nov 12, 2020
c326530
reverted back to standard 2.0
brianlagunas Nov 12, 2020
65f7acb
aligning TFMs
brianlagunas Nov 12, 2020
f002dd9
update build for .net 5
brianlagunas Nov 12, 2020
19e0eae
update target frameworks
dansiegel Nov 24, 2020
dfa9080
update build for .net 5
brianlagunas Nov 12, 2020
8a62199
removed .net 5 for core tests
brianlagunas Dec 18, 2020
97c3929
reverted sdk
brianlagunas Dec 18, 2020
b96f862
bump .net5
dansiegel Jan 6, 2021
d08899b
Merge branch 'master' into net5
dansiegel Jan 25, 2021
b0cbabd
Merge branch 'master' into net5
dansiegel Jan 26, 2021
56f9984
Update build.yml
dansiegel Jan 26, 2021
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
18 changes: 3 additions & 15 deletions build/jobs/uno-uitest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ jobs:
workspace:
clean: all
steps:
- task: UseDotNet@2
displayName: Use .NET 3.1
inputs:
packageType: 'sdk'
useGlobalJson: true
- template: ../steps/prepare-build.yml

- bash: |
build/scripts/wasm-uitest-run.sh
Expand Down Expand Up @@ -47,11 +43,7 @@ jobs:
clean: all

steps:
- task: UseDotNet@2
displayName: Use .NET 3.1
inputs:
packageType: 'sdk'
useGlobalJson: true
- template: ../steps/prepare-build.yml

- template: ../steps/set-runtime.yml

Expand Down Expand Up @@ -88,11 +80,7 @@ jobs:
workspace:
clean: all
steps:
- task: UseDotNet@2
displayName: Use .NET 3.1
inputs:
packageType: 'sdk'
useGlobalJson: true
- template: ../steps/prepare-build.yml

- template: ../steps/set-runtime.yml

Expand Down
6 changes: 6 additions & 0 deletions build/steps/prepare-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ parameters:
solution: '**/*.sln'

steps:
- task: UseDotNet@2
displayName: Ensure 3.1 SDK is Installed
inputs:
packageType: 'sdk'
version: '3.1.405'

- task: UseDotNet@2
displayName: 'Use global.json SDK'
inputs:
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "3.1.405",
"version": "5.0.102",
"rollForward": "latestMinor",
"allowPrerelease": false
},
Expand Down
4 changes: 2 additions & 2 deletions src/Prism.Core/Prism.Core.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">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net47</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;net47;net5.0</TargetFrameworks>
<AssemblyName>Prism</AssemblyName>
<PackageId>Prism.Core</PackageId>
<RootNamespace>Prism</RootNamespace>
Expand All @@ -11,7 +11,7 @@
<PackageTags>prism;wpf;xamarin;mvvm;xaml</PackageTags>
</PropertyGroup>

<ItemGroup Condition=" $(TargetFramework) == 'net45' ">
<ItemGroup Condition=" $(TargetFramework) == 'net461' ">
<PackageReference Include="System.ValueTuple" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>net461;net47;net48;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net461;net47;netcoreapp3.1;net5.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<RootNamespace>Prism.DryIoc</RootNamespace>
<PackageId>Prism.DryIoc</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFrameworks>net461;net47;net48;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net461;net47;netcoreapp3.1;net5.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<RootNamespace>Prism.Unity</RootNamespace>
<PackageId>Prism.Unity</PackageId>
Expand Down
1 change: 0 additions & 1 deletion src/Wpf/Prism.Wpf/Modularity/ModuleInitializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public void Initialize(IModuleInfo moduleInfo)

/// <summary>
/// Handles any exception occurred in the module Initialization process,
/// logs the error using the <see cref="ILoggerFacade"/> and throws a <see cref="ModuleInitializeException"/>.
/// This method can be overridden to provide a different behavior.
/// </summary>
/// <param name="moduleInfo">The module metadata where the error happenened.</param>
Expand Down
4 changes: 2 additions & 2 deletions src/Wpf/Prism.Wpf/Prism.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Prism</RootNamespace>
<TargetFrameworks>net461;net47;net48;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net461;net47;netcoreapp3.1;net5.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<!--<Summary>Prism libraries related to user interface composition, regions, and modularity for WPF.</Summary>-->
<Description>Prism is a fully open source version of the Prism guidance originally produced by Microsoft Patterns &amp; Practices. Prism provides an implementation of a collection of design patterns that are helpful in writing well structured, maintainable, and testable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared library targeting the .NET Framework and .NET Standard. Features that need to be platform specific are implemented in the respective libraries for the target platform (WPF, Uno Platform, and Xamarin Forms).
Expand All @@ -23,7 +23,7 @@ Prism.Wpf helps you more easily design and build rich, flexible, and easy to mai
<Reference Include="System.Configuration" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netcore')) ">
<ItemGroup Condition=" $(TargetFramework.StartsWith('netcore')) OR $(TargetFramework.StartsWith('net5'))">
<Compile Remove="**\*.net45.cs" />
<None Include="**\*.net45.cs" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/Prism.Core.Tests/Prism.Core.Tests.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">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFrameworks>net461;net472;netcoreapp3.1</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net472</TargetFramework>
brianlagunas marked this conversation as resolved.
Show resolved Hide resolved
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Prism.IocContainer.Wpf.Tests.Support.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net472</TargetFramework>
brianlagunas marked this conversation as resolved.
Show resolved Hide resolved
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net472</TargetFramework>
brianlagunas marked this conversation as resolved.
Show resolved Hide resolved
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand Down