Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Commit

Permalink
Update to dot release to fix bundling
Browse files Browse the repository at this point in the history
  • Loading branch information
@PureWeen
PureWeen committed Jun 9, 2020
1 parent 2745dc5 commit 56cdc32
Show file tree
Hide file tree
Showing 19 changed files with 158 additions and 82 deletions.
6 changes: 3 additions & 3 deletions .nuspec/Xamarin.Forms.AppLinks.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<dependency id="Xamarin.Android.Support.v4" version="28.0.0.3"/>
</group>
<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.AndroidX.Migration" version="1.0.0"/>
<dependency id="Xamarin.AndroidX.Migration" version="1.0.0.1"/>
<dependency id="Xamarin.Firebase.AppIndexing" version="71.1602.0"/>
<dependency id="Xamarin.Android.Support.v4" version="28.0.0.3"/>
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.1.0"/>
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0"/>
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.1.0.1"/>
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.1"/>
</group>
</dependencies>
<references>
Expand Down
10 changes: 5 additions & 5 deletions .nuspec/Xamarin.Forms.Maps.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<dependency id="Xamarin.Forms" version="$version$"/>
</group>
<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.AndroidX.Migration" version="1.0.0"/>
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.1.0"/>
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0"/>
<dependency id="Xamarin.AndroidX.Legacy.Support.Core.UI" version="1.0.0"/>
<dependency id="Xamarin.AndroidX.AppCompat" version="1.1.0"/>
<dependency id="Xamarin.AndroidX.Migration" version="1.0.0.1"/>
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.1.0.1"/>
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.1"/>
<dependency id="Xamarin.AndroidX.Legacy.Support.Core.UI" version="1.0.0.1"/>
<dependency id="Xamarin.AndroidX.AppCompat" version="1.1.0.1"/>
<dependency id="Xamarin.GooglePlayServices.Maps" version="71.1610.0"/>
<dependency id="Xamarin.Forms" version="$version$"/>
<dependency id="Xamarin.Android.Support.v4" version="28.0.0.3"/>
Expand Down
4 changes: 2 additions & 2 deletions .nuspec/Xamarin.Forms.Visual.Material.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.3"/>
</group>
<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.1.0" />
<dependency id="Xamarin.Google.Android.Material" version="1.0.0" />
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.1.0.1" />
<dependency id="Xamarin.Google.Android.Material" version="1.0.0.1" />
</group>
<group targetFramework="Xamarin.iOS10">
<dependency id="Xamarin.iOS.MaterialComponents" version="92.0.0"/>
Expand Down
8 changes: 4 additions & 4 deletions .nuspec/Xamarin.Forms.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<group targetFramework="MonoAndroid10.0">
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.1.0" />
<dependency id="Xamarin.Google.Android.Material" version="1.0.0" />
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0" />
<dependency id="Xamarin.AndroidX.Browser" version="1.0.0" />
<dependency id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.1.0.1" />
<dependency id="Xamarin.Google.Android.Material" version="1.0.0.1" />
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.1" />
<dependency id="Xamarin.AndroidX.Browser" version="1.0.0.1" />
</group>
<group targetFramework="MonoAndroid90">
<dependency id="Xamarin.Android.Support.v4" version="28.0.0.3"/>
Expand Down
4 changes: 2 additions & 2 deletions DualScreen/DualScreen.Android/DualScreen.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.1.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.1.0.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.1.0-rc3" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
Expand Down
12 changes: 6 additions & 6 deletions EmbeddingTestBeds/Embedding.Droid/Android10.Build.targets
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>
<ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v10.0'">
<PackageReference Include="Xamarin.AndroidX.Migration">
<Version>1.0.0</Version>
<Version>1.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions PagesGallery/PagesGallery.Droid/Android10.Build.targets
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>
<ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v10.0'">
<PackageReference Include="Xamarin.AndroidX.Migration">
<Version>1.0.0</Version>
<Version>1.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid90'">
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
Expand Down
12 changes: 6 additions & 6 deletions Xamarin.Forms.ControlGallery.Android/Android10.Build.targets
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>
<ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v10.0'">
<PackageReference Include="Xamarin.AndroidX.Migration">
<Version>1.0.0</Version>
<Version>1.0.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.1" />
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]

[assembly: Android.App.MetaData("com.google.android.maps.v2.API_KEY", Value = "AIzaSyAdstcJQswxEjzX5YjLaMcu2aRVEBJw39Y")]
[assembly: Xamarin.Forms.ResolutionGroupName(Xamarin.Forms.Controls.Issues.Effects.ResolutionGroupName)]

// Deliberately broken image source and handler so we can test handling of image loading errors
Expand Down
6 changes: 0 additions & 6 deletions Xamarin.Forms.ControlGallery.Android/Properties/MapsKey.cs.blank
View file

This file was deleted.

10 changes: 3 additions & 7 deletions Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
<Compile Include="Tests\TestingPlatformService.cs" />
<Compile Include="Tests\PlatformTestSettings.cs" />
<Compile Include="PreApplicationClassActivity.cs" />
<Compile Include="Properties\MapsKey.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RegistrarValidationService.cs" />
<Compile Include="CustomRenderers.cs" />
Expand Down Expand Up @@ -408,12 +407,9 @@
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<ItemGroup Condition="Exists('Properties\MapsKey.cs')">
<Compile Include="Properties\MapsKey.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="BeforeBuild">
<CreateItem Include="Properties\MapsKey.cs.blank">
<Output TaskParameter="Include" ItemName="MapsKey" />
</CreateItem>
<Copy SourceFiles="@(MapsKey)" DestinationFiles="Properties\MapsKey.cs" Condition="!Exists('Properties\MapsKey.cs')" />
</Target>
</Project>
6 changes: 3 additions & 3 deletions Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid90'">
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
Expand Down
8 changes: 4 additions & 4 deletions Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Migration">
<Version>1.0.0</Version>
<Version>1.0.0.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<AndroidResource Include="Resources\**\*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid90'">
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
Expand Down
6 changes: 3 additions & 3 deletions Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Migration">
<Version>1.0.0</Version>
<Version>1.0.0.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid10.0'">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0.1" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0.1" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'MonoAndroid90'">
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
Expand Down
Loading

0 comments on commit 56cdc32

Please sign in to comment.