Merge main
This commit is contained in:
Коммит
350ab21450
|
@ -56,10 +56,10 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Text.Encodings.Web">
|
||||
<Version>4.7.1</Version>
|
||||
<Version>4.7.2</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="MainActivity.cs" />
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Text.Json" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.1874" NoWarn="NU1701" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2125" NoWarn="NU1701" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -122,8 +122,8 @@
|
|||
<Reference Include="Xamarin.iOS" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
<PackageReference Include="System.Memory" Version="4.5.4" IncludeAssets="None" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
||||
|
|
|
@ -93,8 +93,8 @@
|
|||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
<PackageReference Include="System.Memory" Version="4.5.4" IncludeAssets="None" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Net.Http.Json" Version="3.2.1" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -57,10 +57,10 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Text.Encodings.Web">
|
||||
<Version>4.7.1</Version>
|
||||
<Version>4.7.2</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="MainActivity.cs" />
|
||||
|
@ -118,7 +118,7 @@
|
|||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<UserProperties XamarinHotReloadDebuggerTimeoutExceptionHybridAuthAppAndroidHideInfoBar="True" TriggeredFromHotReload="False" />
|
||||
<UserProperties TriggeredFromHotReload="False" XamarinHotReloadDebuggerTimeoutExceptionHybridAuthAppAndroidHideInfoBar="True" />
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<!-- Normally this import would be automatic through the nuget package. We do it manually for projects inside this solution. -->
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Text.Json" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.1874" NoWarn="NU1701" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2125" NoWarn="NU1701" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -127,8 +127,8 @@
|
|||
<Reference Include="Xamarin.iOS" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
<PackageReference Include="System.Memory" Version="4.5.4" IncludeAssets="None" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
||||
|
|
|
@ -93,8 +93,8 @@
|
|||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
<PackageReference Include="System.Memory" Version="4.5.4" IncludeAssets="None" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
|
||||
|
|
|
@ -14,9 +14,11 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.19" />
|
||||
<PackageReference Include="System.Net.Http.Json" Version="3.2.1" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -54,8 +54,8 @@
|
|||
<Reference Include="System.Core" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="MainActivity.cs" />
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Text.Json" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.1874" NoWarn="NU1701" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2125" NoWarn="NU1701" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -135,8 +135,8 @@
|
|||
<Reference Include="System.Numerics.Vectors" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
<PackageReference Include="System.Memory" Version="4.5.4" IncludeAssets="None" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
||||
|
|
|
@ -14,9 +14,9 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.10" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.19" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -57,10 +57,10 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Text.Encodings.Web">
|
||||
<Version>4.7.1</Version>
|
||||
<Version>4.7.2</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="MainActivity.cs" />
|
||||
|
@ -122,7 +122,7 @@
|
|||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<UserProperties XamarinHotReloadDebuggerTimeoutExceptionHybridMsalAuthAppAndroidHideInfoBar="True" TriggeredFromHotReload="False" />
|
||||
<UserProperties TriggeredFromHotReload="False" XamarinHotReloadDebuggerTimeoutExceptionHybridMsalAuthAppAndroidHideInfoBar="True" />
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<!-- Normally this import would be automatic through the nuget package. We do it manually for projects inside this solution. -->
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Text.Json" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.1874" NoWarn="NU1701" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2125" NoWarn="NU1701" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -127,8 +127,8 @@
|
|||
<Reference Include="Xamarin.iOS" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
<PackageReference Include="System.Memory" Version="4.5.4" IncludeAssets="None" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
||||
|
@ -153,7 +153,7 @@
|
|||
</ItemGroup>
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<UserProperties XamarinHotReloadGenericExceptionInfoBarHybridMsalAuthAppiOSHideInfoBar="True" TriggeredFromHotReload="False" />
|
||||
<UserProperties TriggeredFromHotReload="False" XamarinHotReloadGenericExceptionInfoBarHybridMsalAuthAppiOSHideInfoBar="True" />
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<!-- Normally this import would be automatic through the nuget package. We do it manually for projects inside this solution. -->
|
||||
|
|
|
@ -93,8 +93,8 @@
|
|||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
<PackageReference Include="System.Memory" Version="4.5.4" IncludeAssets="None" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
|
||||
|
|
|
@ -14,9 +14,11 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.19" />
|
||||
<PackageReference Include="System.Net.Http.Json" Version="3.2.1" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -53,8 +53,8 @@
|
|||
<Reference Include="System.Numerics" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="MainActivity.cs" />
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Text.Json" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.1874" NoWarn="NU1701" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2125" NoWarn="NU1701" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\MobileBlazorBindingsAuthSample\MobileBlazorBindingsAuthSample.csproj" />
|
||||
|
|
|
@ -122,8 +122,8 @@
|
|||
<Reference Include="System.Numerics.Vectors" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\MobileBlazorBindingsAuthSample\MobileBlazorBindingsAuthSample.csproj">
|
||||
|
|
|
@ -11,11 +11,13 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.19" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.19" />
|
||||
<PackageReference Include="System.Net.Http.Json" Version="3.2.1" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -53,8 +53,8 @@
|
|||
<Reference Include="System.Numerics" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="MainActivity.cs" />
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Text.Json" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.1874" NoWarn="NU1701" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2125" NoWarn="NU1701" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\MobileBlazorBindingsHelloWorld\MobileBlazorBindingsHelloWorld.csproj" />
|
||||
|
|
|
@ -122,8 +122,8 @@
|
|||
<Reference Include="System.Numerics.Vectors" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -53,8 +53,8 @@
|
|||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="TextToSpeech_Android.cs" />
|
||||
|
|
|
@ -130,8 +130,8 @@
|
|||
<Reference Include="System.Numerics.Vectors" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="sqlite-net-pcl" Version="1.7.335" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -56,8 +56,8 @@
|
|||
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
|
||||
<Version>28.0.0.3</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="MainActivity.cs" />
|
||||
|
|
|
@ -120,8 +120,8 @@
|
|||
<Reference Include="System.Numerics.Vectors" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -7,8 +7,9 @@
|
|||
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.11" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.11" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.19" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -10,16 +10,18 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="IdentityModel.OidcClient" Version="3.1.2" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -1,35 +1,35 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net6.0;net6.0-android;net6.0-windows10.0.19041</TargetFrameworks>
|
||||
<Title>Mobile Blazor Bindings Core Runtime (experimental)</Title>
|
||||
<Description>Common logic for using Blazor to target native renderers. For mobile app projects for Android and iOS use the Microsoft.MobileBlazorBindings package.</Description>
|
||||
<PackageTags>blazor;mobileblazorbindings</PackageTags>
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net6.0;net6.0-android;net6.0-windows10.0.19041</TargetFrameworks>
|
||||
<Title>Mobile Blazor Bindings Core Runtime (experimental)</Title>
|
||||
<Description>Common logic for using Blazor to target native renderers. For mobile app projects for Android and iOS use the Microsoft.MobileBlazorBindings package.</Description>
|
||||
<PackageTags>blazor;mobileblazorbindings</PackageTags>
|
||||
|
||||
<SignAssembly>true</SignAssembly>
|
||||
</PropertyGroup>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<CodeAnalysisRuleSet>Microsoft.MobileBlazorBindings.Core.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<CodeAnalysisRuleSet>Microsoft.MobileBlazorBindings.Core.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<CodeAnalysisRuleSet>Microsoft.MobileBlazorBindings.Core.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<CodeAnalysisRuleSet>Microsoft.MobileBlazorBindings.Core.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0-rc.2.21480.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0-rc.2.21480.5" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21480.5" />
|
||||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0-rc.2.21480.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0-rc.2.21480.5" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0-rc.2.21480.5" />
|
||||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<FilesToSign Include="$(OutDir)\Microsoft.MobileBlazorBindings.Core.dll">
|
||||
<Authenticode>Microsoft400</Authenticode>
|
||||
</FilesToSign>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<FilesToSign Include="$(OutDir)\Microsoft.MobileBlazorBindings.Core.dll">
|
||||
<Authenticode>Microsoft400</Authenticode>
|
||||
</FilesToSign>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xamarin.Forms.DualScreen" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Forms.DualScreen" Version="5.0.0.2125" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -13,14 +13,15 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -8,15 +8,16 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
<PackageReference Include="System.Text.Json" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<UseWPF>true</UseWPF>
|
||||
|
||||
|
@ -27,11 +27,11 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.664.37" />
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.961.33" />
|
||||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
|
|
|
@ -30,8 +30,9 @@
|
|||
<ItemGroup>
|
||||
<AndroidResource Include="Resources\**\*.xml" SubType="Designer" Generator="MSBuild:UpdateAndroidResources" />
|
||||
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -27,10 +27,11 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.664.37" />
|
||||
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.961.33" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
<PackageReference Include="System.Text.Json" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.1874" NoWarn="NU1701" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2125" NoWarn="NU1701" />
|
||||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
|
|
|
@ -34,7 +34,8 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
|
|
|
@ -30,7 +30,8 @@
|
|||
<ItemGroup>
|
||||
<Reference Include="netstandard" />
|
||||
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
|
|
|
@ -10,10 +10,11 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.10" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.19" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2125" />
|
||||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<UseWindowsForms>true</UseWindowsForms>
|
||||
|
||||
|
@ -27,11 +27,11 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.10" />
|
||||
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.664.37" />
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.19" />
|
||||
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.961.33" />
|
||||
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="0.4.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.MobileBlazorBindings.WebView.Android" Version="MobileBlazorBindingsVersion" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.1" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
|
||||
<PackageReference Include="Xamarin.Essentials" Version="XamarinEssentialsVersion" />
|
||||
<PackageReference Include="Xamarin.Forms" Version="XamarinFormsVersion" />
|
||||
</ItemGroup>
|
||||
|
|
Загрузка…
Ссылка в новой задаче