Skip to content

Commit

Permalink
feat!: Update to Uno 5
Browse files Browse the repository at this point in the history
  • Loading branch information
carlh98 committed Nov 25, 2023
1 parent b6df421 commit 2cc4efb
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 336 deletions.
8 changes: 8 additions & 0 deletions BREAKING_CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Breaking Changes

## 2.0.0
- Added support for .NET 7.
- Updated Uno.WinUI to 5.0.19.
- Updated Windows SDK version from 18362 to 19041.
- Removed support for Xamarin.
- Removed support for .NET 6.
- Removed support for NetStandard2.0 in DynamicMvvm.Uno.WinUI.

## 0.11.0
- `DecoratorCommandStrategy` not longer exists. Use `DelegatingCommandStrategy` instead.

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public MainPage()
}
```

### Legacy
For UWP or Uno.UI apps, install the `Chinook.DynamicMvvm.Uno` nuget package.
You can then use `CoreDispatcherDispatcher` or `BatchingCoreDispatcherDispatcher`.
```csharp
Expand Down
15 changes: 4 additions & 11 deletions build/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
include:
- main

resources:
containers:
- container: windows
image: nventive/vs_build-tools:17.2.5

variables:
- name: NUGET_VERSION
value: 6.2.0
Expand All @@ -20,8 +15,8 @@ variables:
- name: IsReleaseBranch # Should this branch name use the release stage
value: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/feature/'))]
# Pool names
- name: windowsPoolName
value: 'windows 2022'
- name: windowsHostedAgentImage
value: 'windows-2022'

stages:
- stage: Build
Expand All @@ -36,7 +31,7 @@ stages:
GeneratePackageOnBuild: true

pool:
name: $(windowsPoolName)
vmImage: $(windowsHostedAgentImage)

variables:
- name: PackageOutputPath # Path where nuget packages will be copied to.
Expand All @@ -45,8 +40,6 @@ stages:
workspace:
clean: all # Cleanup the workspaca before starting

container: windows

steps:
- template: stage-build.yml

Expand All @@ -57,7 +50,7 @@ stages:
- job: Publish_NuGet_External

pool:
name: $(windowsPoolName)
vmImage: $(windowsHostedAgentImage)

workspace:
clean: all # Cleanup the workspaca before starting
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Description>Chinook.DynamicMvvm is a collection of extensible MVVM libraries for declarative ViewModels.</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageTags>mvvm;xamarin;ios;android;uwp;chinook;maui;winui;</PackageTags>
<PackageTags>mvvm;ios;android;chinook;maui;winui;</PackageTags>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/nventive/Chinook.DynamicMvvm</PackageProjectUrl>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Description>Chinook.DynamicMvvm is a collection of extensible MVVM libraries for declarative ViewModels.</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageTags>mvvm;xamarin;ios;android;uwp;chinook;maui;winui;</PackageTags>
<PackageTags>mvvm;ios;android;uwp;chinook;maui;winui;</PackageTags>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/nventive/Chinook.DynamicMvvm</PackageProjectUrl>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Description>Chinook.DynamicMvvm is a collection of extensible MVVM libraries for declarative ViewModels.</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageTags>mvvm;xamarin;ios;android;uwp;chinook;maui;winui;</PackageTags>
<PackageTags>mvvm;ios;android;chinook;maui;winui;</PackageTags>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/nventive/Chinook.DynamicMvvm</PackageProjectUrl>

Expand Down
2 changes: 1 addition & 1 deletion src/DynamicMvvm.Reactive/DynamicMvvm.Reactive.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Description>Chinook.DynamicMvvm is a collection of extensible MVVM libraries for declarative ViewModels.</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageTags>mvvm;xamarin;ios;android;uwp;chinook;maui;winui;</PackageTags>
<PackageTags>mvvm;ios;android;chinook;maui;winui;</PackageTags>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/nventive/Chinook.DynamicMvvm</PackageProjectUrl>

Expand Down
12 changes: 4 additions & 8 deletions src/DynamicMvvm.Uno.WinUI/DynamicMvvm.Uno.WinUI.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
<PropertyGroup>
<TargetFrameworks>net6.0-windows10.0.18362;netstandard2.0;net6.0-android;net6.0-ios;net6.0-macos;net6.0-maccatalyst;</TargetFrameworks>
<LangVersion>10.0</LangVersion>
<TargetFrameworks>net7.0-windows10.0.19041;net7.0-android;net7.0-ios;net7.0-macos;net7.0-maccatalyst;</TargetFrameworks>
<LangVersion>11.0</LangVersion>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
<RootNamespace>Chinook.DynamicMvvm</RootNamespace>
Expand Down Expand Up @@ -32,20 +32,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Uno.WinUI" Version="4.4.13" />
<PackageReference Include="Uno.WinUI" Version="5.0.19" />
<PackageReference Include="Uno.SourceGenerationTasks" Version="4.1.0" />
</ItemGroup>

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

<ItemGroup>
<!--Needed for Source Link support -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows10.0.18362'">
<ItemGroup Condition="'$(TargetFramework)'=='net7.0-windows10.0.19041'">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" />
Expand Down
119 changes: 0 additions & 119 deletions src/DynamicMvvm.Uno/Dispatchers/BatchingCoreDispatcherDispatcher.cs

This file was deleted.

76 changes: 0 additions & 76 deletions src/DynamicMvvm.Uno/Dispatchers/CoreDispatcherDispatcher.cs

This file was deleted.

44 changes: 0 additions & 44 deletions src/DynamicMvvm.Uno/Dispatchers/DispatcherFactory.cs

This file was deleted.

Loading

0 comments on commit 2cc4efb

Please sign in to comment.