Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "5.0.301",
"version": "6.0.300",
"rollForward": "latestMinor",
"allowPrerelease": false
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.38",
"Microsoft.Build.CentralPackageVersions": "2.0.79"
"MSBuild.Sdk.Extras": "3.0.44",
"Microsoft.Build.CentralPackageVersions": "2.1.3"
}
}
2 changes: 1 addition & 1 deletion src/Prism.Core/Prism.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;net47;net5.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;net47;net6.0</TargetFrameworks>
<AssemblyName>Prism</AssemblyName>
<PackageId>Prism.Core</PackageId>
<RootNamespace>Prism</RootNamespace>
Expand Down
12 changes: 6 additions & 6 deletions src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.WinUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;xamarinios10;MonoAndroid11.0;MonoAndroid12.0;xamarinmac20</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net5.0-windows10.0.18362</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net6.0-windows10.0.18362</TargetFrameworks>
<NoWarn>$(NoWarn);1591</NoWarn>
<AssemblyName>Prism.DryIoc.Uno</AssemblyName>
<PackageId>Prism.DryIoc.Uno.WinUI</PackageId>
Expand All @@ -19,26 +19,26 @@
Prism provides an implementation of a collection of design patterns that are helpful in writing well structured and maintainable 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). Prism for Uno Platform helps you more easily design and build rich, flexible, and easy to maintain Windows UWP, WinUI &amp; cross platform Uno applications.</Description>
<PackageTags>prism;winui;windows;uno;mvvm;uwp;ios;android;macos;webassembly;linux;xaml;dryioc</PackageTags>
</PropertyGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('xamarinios')) or $(TargetFramework.StartsWith('xamarinmac')) or $(TargetFramework.StartsWith('MonoAndroid')) or $(TargetFramework.StartsWith('netstandard'))">
<PackageReference Include="Uno.WinUI" />
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
</PropertyGroup>

<ItemGroup>
<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
<Compile Update="**\*.xaml.cs">
<DependentUpon>%(Filename)</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\..\Wpf\Prism.DryIoc.Wpf\**\*.cs" Exclude="..\..\Wpf\Prism.DryIoc.Wpf\bin\**\*.cs;..\..\Wpf\Prism.DryIoc.Wpf\obj\**\*.cs" />
<EmbeddedResource Include="..\..\Wpf\Prism.Unity.Wpf\Properties\**\*.resx" Link="Properties\%(FileName)%(Extension)" />
Expand All @@ -61,4 +61,4 @@ Prism provides an implementation of a collection of design patterns that are hel
</EmbeddedResource>
</ItemGroup>
<Import Project="..\..\Containers\Prism.DryIoc.Shared\Prism.DryIoc.Shared.projitems" Label="Shared" />
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="MSBuild.Sdk.Extras">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;xamarinios10;MonoAndroid11.0;MonoAndroid12.0;xamarinmac20</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net5.0-windows10.0.18362</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net6.0-windows10.0.18362</TargetFrameworks>
<GenerateLibraryLayout>true</GenerateLibraryLayout>
<AssemblyName>Prism.Uno</AssemblyName>
<RootNamespace>Prism</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
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;netcoreapp3.1;net5.0-windows</TargetFrameworks>
<TargetFrameworks>net461;net47;net6.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
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;netcoreapp3.1;net5.0-windows</TargetFrameworks>
<TargetFrameworks>net461;net47;net6.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<RootNamespace>Prism.Unity</RootNamespace>
<PackageId>Prism.Unity</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion src/Wpf/Prism.Wpf/Prism.Wpf.csproj
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;netcoreapp3.1;net5.0-windows</TargetFrameworks>
<TargetFrameworks>net461;net47;net6.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 Down