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

Update Windows App SDK #2276

Merged
merged 17 commits into from
Oct 12, 2022
Merged

Update Windows App SDK #2276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
aa433a2
Removing all .NET 5 SDK requirements
mattleibow Sep 29, 2022
9c98fd3
Remove the old code
mattleibow Sep 29, 2022
ef9cc26
Merge branch 'main' into dev/no-net5.0
mattleibow Sep 30, 2022
681920d
Update azure-templates-bootstrapper.yml
mattleibow Sep 30, 2022
1550df3
Merge branch 'main' into dev/no-net5.0
mattleibow Oct 3, 2022
1067e26
Merge branch 'main' into dev/no-net5.0
mattleibow Oct 4, 2022
81c60e2
Fix the casing on linux
mattleibow Oct 4, 2022
3408965
Merge branch 'main' into dev/no-net5.0
mattleibow Oct 4, 2022
787f2d7
list it all
mattleibow Oct 4, 2022
ace83ec
try this
mattleibow Oct 4, 2022
1cc70e3
Seems to only be there partially
mattleibow Oct 4, 2022
e35d0b9
Update WinAppSDK
mattleibow Oct 4, 2022
1b1ca93
Merge branch 'main' into dev/wasdk
mattleibow Oct 4, 2022
869a292
Merge branch 'main' into dev/wasdk
mattleibow Oct 5, 2022
5502ea7
71356
mattleibow Oct 5, 2022
1ec3c7f
Xamarin.Mac.dll is missing from VS?
mattleibow Oct 7, 2022
cbedcf4
Update azure-pipelines-complete.yml
mattleibow Oct 12, 2022
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 VERSIONS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ System.Drawing.Common release 4.5.1
SharpVk release 0.4.2
Uno.UI release 4.0.8
Uno.WinUI release 4.0.13
Microsoft.WindowsAppSDK release 1.0.3
Microsoft.WindowsAppSDK release 1.1.5
Microsoft.Maui.Graphics release 6.0.300-rc.2.1310
Microsoft.Windows.SDK.NET.Ref release 10.0.19041.24
Microsoft.AspNetCore.Components.Web release 6.0.0
Expand Down
1 change: 1 addition & 0 deletions cake/UtilsManaged.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
comparer.SearchPaths.AddRange(GetDotNetPacksSearchPaths());
comparer.SearchPaths.AddRange(GetReferenceSearchPaths());
comparer.PackageCache = PACKAGE_CACHE_PATH.FullPath;
comparer.IgnoreResolutionErrors = true;

await AddDep("OpenTK.GLControl", "NET20");
await AddDep("Tizen.NET", "netstandard2.0");
Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/WinUI/Msix/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/WinUI/WapProj/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" IncludeAssets="build" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" IncludeAssets="build" />
</ItemGroup>
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
</Project>
2 changes: 1 addition & 1 deletion samples/Basic/WinUI/WapProj/SkiaSharpSample/SkiaSharpSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<WindowsAppSdkBootstrapInitialize>false</WindowsAppSdkBootstrapInitialize>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
Expand Down