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.

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

Upgrade to .NET 7, enable WASM optimizations #485

Merged
merged 46 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
2aefbab
Upgraded to net7.0 and Uno 5 previews
Arlodotexe Jul 20, 2023
8e6316b
Update tooling
Arlodotexe Jul 20, 2023
d1eaf0c
Fixes for build errors
Arlodotexe Jul 20, 2023
c4558aa
Remove problematic empty sample project
Arlodotexe Jul 20, 2023
137324e
Update tooling
Arlodotexe Jul 20, 2023
be4533c
Update tooling to latest
Arlodotexe Jul 20, 2023
0404035
Update tooling
Arlodotexe Jul 20, 2023
69076df
Update editorconfig
Arlodotexe Jul 20, 2023
a86ff82
Update tooling
Arlodotexe Jul 20, 2023
71fb6d5
Set CA2213 to 'None'
Arlodotexe Jul 21, 2023
e88f5a5
Set CA1001 to 'none'
Arlodotexe Jul 21, 2023
4f0bf98
Update tooling
Arlodotexe Jul 21, 2023
68b7695
Fixed invalid XML comments
Arlodotexe Jul 21, 2023
586f641
Fixed invalid XML comments
Arlodotexe Jul 21, 2023
c5b7ca9
Fixed invalid xml doc param name
Arlodotexe Jul 21, 2023
fa095c7
Disable CS1572 in Labs
Arlodotexe Jul 21, 2023
d3ffaad
Update tooling
Arlodotexe Jul 21, 2023
9e08feb
Update tooling
Arlodotexe Jul 22, 2023
ea7e063
Update uno-check
Arlodotexe Jul 24, 2023
5b36a64
Update uno-check version
Arlodotexe Jul 24, 2023
7022eeb
Update tooling
Arlodotexe Jul 24, 2023
9e33753
Skip vswinworkloads in uno-check
Arlodotexe Jul 24, 2023
c66fb18
Update tooling repo
Arlodotexe Aug 1, 2023
1210368
Update tooling repo
Arlodotexe Aug 2, 2023
07f5f4b
Update tooling submodule
Arlodotexe Aug 2, 2023
cdb7c15
Update tooling submodule
Arlodotexe Aug 9, 2023
14fbe03
Merge branch 'main' into upgrade/net7
Arlodotexe Aug 9, 2023
f228ad6
Updated tooling to latest main
Arlodotexe Aug 18, 2023
4d89f42
Use .NET 7.0.100
Arlodotexe Aug 18, 2023
cced9d7
Use dotnet 7.0.100 in CI
Arlodotexe Aug 18, 2023
9ca1733
Suppress Uno0001
Arlodotexe Aug 18, 2023
52efbfd
Restore removed files
Arlodotexe Aug 18, 2023
90d29de
Bump uno-check to latest version
Arlodotexe Oct 2, 2023
10ec55b
Bump tooling to latest main
Arlodotexe Oct 2, 2023
d58e1cb
Remove CS1572 suppression
Arlodotexe Oct 2, 2023
5a246f3
Merge branch 'main' into upgrade/net7
Arlodotexe Oct 2, 2023
92b30f5
Update tooling to test fix
Arlodotexe Oct 3, 2023
b36f42a
Update .editorconfig
Arlodotexe Oct 3, 2023
28e80c9
Fixes issues with the build script in detecting dump files to upload …
Arlodotexe Oct 3, 2023
a964b90
Include component icons as library assets
Arlodotexe Oct 3, 2023
979aebf
Porting build.yml changes made in main repo
Arlodotexe Oct 3, 2023
4c6637f
Cleanup release steps
Arlodotexe Oct 12, 2023
77f997d
Restore pushing to LabsFeed
Arlodotexe Oct 12, 2023
cee0351
Fixed date versioning for PRs
Arlodotexe Oct 23, 2023
3122ae2
Bump uno-check
Arlodotexe Oct 23, 2023
dda9f2c
Update tooling to latest main
Arlodotexe Oct 24, 2023
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"uno.check": {
"version": "1.10.0",
"version": "1.15.0",
"commands": [
"uno-check"
]
Expand Down
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,6 @@ dotnet_diagnostic.CA2200.severity = warning
dotnet_diagnostic.CA2202.severity = warning
dotnet_diagnostic.CA2207.severity = warning
dotnet_diagnostic.CA2212.severity = warning
dotnet_diagnostic.CA2213.severity = warning
dotnet_diagnostic.CA2214.severity = warning
dotnet_diagnostic.CA2216.severity = warning
dotnet_diagnostic.CA2220.severity = warning
Expand Down Expand Up @@ -433,5 +432,6 @@ csharp_style_prefer_extended_property_pattern = true:suggestion
# Require file header
dotnet_diagnostic.IDE0073.severity = warning

# Uno platform exposes IDisposable on Storyboard publicly when it should be internal. Ignore this.
dotnet_code_quality.CA1001.excluded_type_names_with_derived_types = T:Windows.UI.Xaml.Media.Animation.Storyboard
# Member owns disposable field
dotnet_diagnostic.CA2213.severity = none
Arlodotexe marked this conversation as resolved.
Show resolved Hide resolved
dotnet_diagnostic.CA1001.severity = none
Arlodotexe marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Arlodotexe marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
workflow_dispatch:

env:
DOTNET_VERSION: ${{ '7.0.x' }}
DOTNET_VERSION: ${{ '7.0.100' }}
ENABLE_DIAGNOSTICS: false
#COREHOST_TRACE: 1
COREHOST_TRACEFILE: corehosttrace.log
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
run: dotnet tool restore

- name: Run Uno Check to Install Dependencies
run: dotnet tool run uno-check --ci --fix --non-interactive --skip wsl --skip androidemulator --verbose
run: dotnet tool run uno-check --ci --fix --non-interactive --skip wsl --skip androidemulator --skip vswinworkloads --verbose

- name: Add msbuild to PATH
uses: microsoft/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"csharp.suppressDotnetInstallWarning": true,
"csharp.suppressDotnetRestoreNotification": true,
"csharp.semanticHighlighting.enabled": true,
"omnisharp.enableImportCompletion": true,
"omnisharp.enableMsBuildLoadProjectsOnDemand": true
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
"dotnet.completion.showCompletionItemsFromUnimportedNamespaces": true
}
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);Uno0001</NoWarn>
</PropertyGroup>

<Import Project="Windows.Toolkit.Common.props" />
Expand Down
2 changes: 2 additions & 0 deletions components/AppServices/src/AppServiceHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@ public abstract class AppServiceHost
/// The name of the app service.
/// </summary>
private readonly string _appServiceName;
#pragma warning disable CA1001
private readonly SemaphoreSlim _semaphoreConnection = new(0, 1);
private readonly SemaphoreSlim _lockConnection = new(1, 1);
#pragma warning restore CA1001

/// <summary>
/// <para>
Expand Down
2 changes: 1 addition & 1 deletion components/CanvasView/src/CanvasView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
cp.ManipulationDelta += ContentPresenter_ManipulationDelta;
}

/// TODO: Do we want to support something else in a custom template?? else if (item is FrameworkElement fe && fe.FindDescendant/GetContentControl?)
// TODO: Do we want to support something else in a custom template?? else if (item is FrameworkElement fe && fe.FindDescendant/GetContentControl?)
}

protected override void ClearContainerForItemOverride(DependencyObject element, object item)
Expand Down
8 changes: 4 additions & 4 deletions components/RivePlayer/src/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@
<!-- WinUI 2 / UWP -->
<ItemGroup Condition="'$(IsUwp)' == 'true'">
<!-- <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.2"/> -->
<PackageReference Include="SkiaSharp.Views" Version="2.88.2" />
<PackageReference Include="SkiaSharp.Views" Version="2.88.3" />
</ItemGroup>

<!-- WinUI 2 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
<!-- <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.11"/> -->
<PackageReference Include="SkiaSharp.Views.Uno" Version="2.88.2" />
<PackageReference Include="SkiaSharp.Views.Uno" Version="2.88.3" />
</ItemGroup>

<!-- WinUI 3 / WinAppSdk -->
<ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
<!-- <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2"/> -->
<PackageReference Include="SkiaSharp.Views.WinUI" Version="2.88.2" />
<PackageReference Include="SkiaSharp.Views.WinUI" Version="2.88.3" />
</ItemGroup>

<!-- WinUI 3 / Uno -->
<ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
<!-- <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.100-dev.15.g12261e2626"/> -->
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.2" />
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ public class TokenItemRemovingEventArgs : EventArgs
/// Initializes a new instance of the <see cref="TokenItemRemovingEventArgs"/> class.
/// </summary>
/// <param name="item">Item being removed.</param>
/// <param name="Token"><see cref="Token"/> container being closed.</param>
public TokenItemRemovingEventArgs(object item, TokenItem tokenITem)
/// <param name="tokenItem"><see cref="TokenItem"/> container being closed.</param>
public TokenItemRemovingEventArgs(object item, TokenItem tokenItem)
{
Item = item;
TokenItem = tokenITem;
TokenItem = tokenItem;
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.405",
"version": "7.0.100",
"rollForward": "latestFeature"
},
"msbuild-sdks":
Expand Down
2 changes: 1 addition & 1 deletion tooling
Submodule tooling updated 282 files
Loading