Skip to content

Commit

Permalink
chore: fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@nickrandolph
nickrandolph authored Aug 14, 2023
1 parent 8304e1a commit db8e85d
Showing 1 changed file with 1 addition and 80 deletions.
81 changes: 1 addition & 80 deletions testing/TestHarness/Directory.Packages.props
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project ToolsVersion="15.0">
<<<<<<< HEAD
<ItemGroup>
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.0.0" />
<PackageVersion Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
Expand All @@ -18,7 +17,7 @@
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
<PackageVersion Include="Microsoft.Toolkit.Uwp.UI" Version="7.1.2" />
<PackageVersion Include="Microsoft.UI.Xaml" Version="2.7.1" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230724000" />
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="5.0.0" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
<PackageVersion Include="Refit" Version="6.3.2" />
Expand Down Expand Up @@ -73,82 +72,4 @@
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
<PackageVersion Include="Xamarin.UITest" Version="3.2.9" />
</ItemGroup>
=======
<ItemGroup>
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.0.0" />
<PackageVersion Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
<PackageVersion Include="FluentAssertions" Version="6.6.0" />
<PackageVersion Include="FluentValidation" Version="11.4.0" />
<PackageVersion Include="IdentityModel.OidcClient" Version="5.0.0" />
<PackageVersion Include="AspNet.Security.OAuth.Apple" Version="6.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.7" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.7" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.7" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.55.0" />
<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.2.0" />
<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.11" />
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
<PackageVersion Include="Microsoft.Toolkit.Uwp.UI" Version="7.1.2" />
<PackageVersion Include="Microsoft.UI.Xaml" Version="2.8.5" />
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230724000" />
<PackageVersion Include="Microsoft.Windows.Compatibility" Version="5.0.0" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
<PackageVersion Include="Refit" Version="6.3.2" />
<PackageVersion Include="Refit.HttpClientFactory" Version="6.3.2" />
<PackageVersion Include="SkiaSharp" Version="2.88.3" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.3" />
<PackageVersion Include="SkiaSharp.HarfBuzz" Version="2.88.3" />
<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.3" />
<PackageVersion Include="SkiaSharp.Views" Version="2.88.3" />
<PackageVersion Include="SkiaSharp.Views.Uno" Version="2.88.3" />
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
<PackageVersion Include="SkiaSharp.Views.WPF" Version="2.88.3" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="System.Text.Json" Version="6.0.3" />
<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI" Version="7.1.100" />
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageVersion Include="Uno.Extensions.Logging.OSLog " Version="1.4.0" />
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0" />
<PackageVersion Include="Uno.Material" Version="3.0.0-dev.252" />
<PackageVersion Include="Uno.Material.WinUI" Version="3.0.0-dev.252" />
<PackageVersion Include="Uno.Microsoft.Toolkit.Uwp.UI" Version="7.1.11" />
<PackageVersion Include="Uno.Toolkit.UI" Version="3.1.0-dev.24" />
<PackageVersion Include="Uno.Toolkit.UI.Material" Version="3.1.0-dev.24" />
<PackageVersion Include="Uno.Toolkit.WinUI" Version="3.1.0-dev.24" />
<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="3.1.0-dev.24" />
<PackageVersion Include="Uno.UI" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.UI.MSAL" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.UI.RemoteControl" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.UI.Skia.Gtk" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.UI.Skia.Linux.FrameBuffer" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.UI.Skia.Tizen" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.UI.Skia.Wpf" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.UI.WebAssembly" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.UITest" Version="1.1.0-dev.59" />
<PackageVersion Include="Uno.UITest.Selenium" Version="1.1.0-dev.59" />
<PackageVersion Include="Uno.UITest.Xamarin" Version="1.1.0-dev.59" />
<PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.59" />
<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
<PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.12" />
<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.12" />
<PackageVersion Include="Uno.WinUI" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.WinUI.MSAL" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.WinUI.RemoteControl" Version="5.0.0-dev.1728" />
<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.0.0-dev.1728" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="NunitXml.TestLogger" Version="3.0.131" />
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
<PackageVersion Include="Xamarin.UITest" Version="4.1.2" />
</ItemGroup>
>>>>>>> 7c164362 (fix: Bump WinAppSdk reference version)
</Project>

0 comments on commit db8e85d

Please sign in to comment.