Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
martijn00 committed Dec 8, 2020
1 parent 558efc9 commit 94b6fdc
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<RepositoryUrl>https://github.com/Baseflow/XF-Material-Library</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<Version>1.7.6</Version>
<Version>1.7.7</Version>
<Platform>AnyCPU</Platform>

<!--<Nullable>enable</Nullable>-->
Expand Down Expand Up @@ -93,11 +93,11 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="IDisposableAnalyzers" Version="3.4.2">
<PackageReference Include="IDisposableAnalyzers" Version="3.4.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1">
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac">
<Version>6.0.0</Version>
<Version>6.1.0</Version>
</PackageReference>
<PackageReference Include="Autofac.Extras.CommonServiceLocator">
<Version>6.0.1</Version>
</PackageReference>
<PackageReference Include="Rg.Plugins.Popup">
<Version>2.0.0.7</Version>
<Version>2.0.0.8</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Autofac" Version="6.0.0" />
<PackageReference Include="Autofac" Version="6.1.0" />
<PackageReference Include="Autofac.Extras.CommonServiceLocator" Version="6.0.1" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.657" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Samples/MaterialMvvmSample.Uwp/MaterialMvvmSample.Uwp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.9</Version>
<Version>6.2.11</Version>
</PackageReference>
<PackageReference Include="Rg.Plugins.Popup">
<Version>2.0.0.7</Version>
<Version>2.0.0.8</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>4.5.0.657</Version>
Expand Down
4 changes: 2 additions & 2 deletions Samples/MaterialMvvmSample.iOS/MaterialMvvmSample.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac">
<Version>6.0.0</Version>
<Version>6.1.0</Version>
</PackageReference>
<PackageReference Include="Autofac.Extras.CommonServiceLocator">
<Version>6.0.1</Version>
</PackageReference>
<PackageReference Include="Rg.Plugins.Popup">
<Version>2.0.0.7</Version>
<Version>2.0.0.8</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
Expand Down
4 changes: 2 additions & 2 deletions Samples/MaterialMvvmSample/MaterialMvvmSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Autofac" Version="6.0.0" />
<PackageReference Include="Autofac" Version="6.1.0" />
<PackageReference Include="Autofac.Extras.CommonServiceLocator" Version="6.0.1" />
<PackageReference Include="Vapolia.Xamarin.Svg.Forms" Version="3.3.0" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.657" />
<PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.7" />
<PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.8" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion XF.Material/Platforms/Android/Material.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public static void Init(Context context, Bundle bundle)
IsJellyBean = Build.VERSION.SdkInt < BuildVersionCodes.Kitkat;

AppCompatDelegate.CompatVectorFromResourcesEnabled = true;
Popup.Init(context, bundle);
Popup.Init(context);
}
}
}
4 changes: 2 additions & 2 deletions XF.Material/XF.Material.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.7" />
<PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.8" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.657" />
<PackageReference Include="Com.Airbnb.Xamarin.Forms.Lottie" Version="4.0.7" />
<PackageReference Include="Com.Airbnb.Xamarin.Forms.Lottie" Version="4.0.8" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "2.1.2"
"MSBuild.Sdk.Extras": "3.0.22"
}
}

0 comments on commit 94b6fdc

Please sign in to comment.