Skip to content

Commit fbfa427

Browse files
nickrandolphnickrandolph
authored
Merge pull request #618 from unoplatform/dev/nr/winridfix
chore: Fix Rid related build errors/warnings
2 parents 9d44adf + 290fb62 commit fbfa427

File tree

116 files changed

+465
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+465
-284
lines changed

‎UI/AdvancedXBind/AdvancedXBind.Mobile/Android/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="AdvancedXBind.AdvancedXBind" android:versionCode="1" android:versionName="1.0">
3-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
43
<application android:label="Advanced x:Bind"></application>
54
</manifest>

‎UI/AdvancedXBind/AdvancedXBind.Skia.Gtk/app.manifest

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
5050
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
5151
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
52-
5352
<application xmlns="urn:schemas-microsoft-com:asm.v3">
5453
<windowsSettings>
5554
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>

‎UI/AdvancedXBind/AdvancedXBind.Windows/AdvancedXBind.Windows.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
1313
<UseWinUI>true</UseWinUI>
1414
<EnableMsixTooling>true</EnableMsixTooling>
15+
<DefaultLanguage>en</DefaultLanguage>
1516
</PropertyGroup>
1617

1718
<ItemGroup>

‎UI/AdvancedXBind/AdvancedXBind.Windows/Properties/PublishProfiles/win10-arm64.pubxml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6+
<PropertyGroup>
7+
<PublishProtocol>FileSystem</PublishProtocol>
8+
<Platform>arm64</Platform>
9+
<RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
10+
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
11+
<SelfContained>true</SelfContained>
12+
<PublishSingleFile>False</PublishSingleFile>
13+
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
14+
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
15+
<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
16+
<!--
17+
<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
18+
<TrimMode>partial</TrimMode>
19+
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
20+
-->
21+
</PropertyGroup>
22+
</Project>

‎UI/AdvancedXBind/AdvancedXBind.Windows/Properties/PublishProfiles/win10-x64.pubxml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6+
<PropertyGroup>
7+
<PublishProtocol>FileSystem</PublishProtocol>
8+
<Platform>x64</Platform>
9+
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
10+
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
11+
<SelfContained>true</SelfContained>
12+
<PublishSingleFile>False</PublishSingleFile>
13+
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
14+
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
15+
<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
16+
<!--
17+
<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
18+
<TrimMode>partial</TrimMode>
19+
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
20+
-->
21+
</PropertyGroup>
22+
</Project>

‎UI/AdvancedXBind/AdvancedXBind.Windows/Properties/PublishProfiles/win10-x86.pubxml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
https://go.microsoft.com/fwlink/?LinkID=208121.
4+
-->
5+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6+
<PropertyGroup>
7+
<PublishProtocol>FileSystem</PublishProtocol>
8+
<Platform>x86</Platform>
9+
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
10+
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
11+
<SelfContained>true</SelfContained>
12+
<PublishSingleFile>False</PublishSingleFile>
13+
<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
14+
<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
15+
<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
16+
<!--
17+
<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
18+
<TrimMode>partial</TrimMode>
19+
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
20+
-->
21+
</PropertyGroup>
22+
</Project>

‎UI/AndroidCustomCamera/AndroidCustomCamera/AndroidCustomCamera.Mobile/Android/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.companyname.AndroidCustomCamera" android:versionCode="1" android:versionName="1.0">
3-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
43
<application android:label="AndroidCustomCamera"></application>
54
</manifest>

‎UI/AndroidCustomCamera/AndroidCustomCamera/AndroidCustomCamera.Shared/MainPage.xaml.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
using Android.Graphics;
33
using Android.Provider;
44
using Microsoft.UI.Xaml;
5-
using Uno.UI;
6-
using Microsoft.UI.Xaml;
75
using Microsoft.UI.Xaml.Controls;
6+
using Uno.UI;
87

98
namespace AndroidCustomCamera
109
{

‎UI/Authentication.OidcDemo/Authentication.OidcDemo/Authentication.OidcDemo.Droid/Properties/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Authentication.OidcDemo" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
3-
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="31" />
4-
<application android:label="Authentication.OidcDemo"></application>
3+
<application android:label="Authentication.OidcDemo"></application>
54
</manifest>

‎UI/Authentication.OidcDemo/Authentication.OidcDemo/Authentication.OidcDemo.Mobile/Android/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.companyname.Authentication.OidcDemo" android:versionCode="1" android:versionName="1.0">
3-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
43
<application android:label="Authentication.OidcDemo"></application>
54
</manifest>

0 commit comments

Comments
 (0)