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

.csproj properties for WinUI sample viewer #1544

Closed
wants to merge 5 commits into from
Closed

.csproj properties for WinUI sample viewer #1544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
87ce28d
add property: AllowUnsafeBlocks
williambohrmann3 Dec 9, 2024
7bf6574
add property: WindowsSdkPackageVersion
williambohrmann3 Dec 9, 2024
04afa4b
apply properties to maui app
williambohrmann3 Dec 9, 2024
81df16d
windows conditionals
williambohrmann3 Dec 10, 2024
acb6484
Added explicit PackageReference for Microsoft.WindowsAppSDK in ArcGIS…
prathameshnarkhede Dec 11, 2024
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 src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PackageVersion Include="CommunityToolkit.Maui" Version="9.0.1" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageVersion Include="WinUIEx" Version="2.3.4" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" Condition="'$(UseMaui)'!='true'" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" Condition="'$(UseMaui)'!='true'" />
<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13" />
<PackageVersion Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="6.1.1" />
Expand Down
3 changes: 3 additions & 0 deletions src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<DefineConstants>$(DefineConstants);MAUI</DefineConstants>
<RuntimeIdentifiers Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<RuntimeIdentifier Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows' AND '$(Platform)' == 'AnyCPU'">win10-x64</RuntimeIdentifier>
<AllowUnsafeBlocks Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">True</AllowUnsafeBlocks>
<WindowsSdkPackageVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.19041.38</WindowsSdkPackageVersion>
<AppxPackageDir>..\..\..\output\$(RuntimeIdentifier)\</AppxPackageDir>
</PropertyGroup>

Expand Down Expand Up @@ -144,6 +146,7 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows10.0.19041.0'">
<PackageReference Include="WinUIEx" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
<PackageReference Include="Microsoft.WindowsAppSDK" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
<PackageReference Include="Xamarin.AndroidX.AppCompat" />
Expand Down
2 changes: 2 additions & 0 deletions src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
<EnableMsixTooling>true</EnableMsixTooling>
<DefineConstants>$(DefineConstants);WinUI</DefineConstants>
<UseRidGraph>true</UseRidGraph>
<WindowsSdkPackageVersion>10.0.19041.38</WindowsSdkPackageVersion>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading