Skip to content

Commit

Permalink
[Nuget] Components governance (xamarin#11188)
Browse files Browse the repository at this point in the history
* Update packages

* Update packages 2

* Update Newtonsoft

* Update Xamarin.Forms.Xaml.UnitTests.csproj

* Update PagesGallery.Droid.csproj

* Update Xamarin.Forms.Platform.UAP.csproj

* Update Xamarin.Forms.Platform.UAP.csproj

* Update Xamarin.Forms.Maps.UWP.csproj

* [Nuget] Update UITests

* [Nuget] Update nuspecs

* Update Git.Build.targets
  • Loading branch information
rmarinho authored Jun 25, 2020
1 parent f127392 commit 50e72c7
Show file tree
Hide file tree
Showing 24 changed files with 43 additions and 43 deletions.
4 changes: 2 additions & 2 deletions .nuspec/Xamarin.Forms.Pages.Azure.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<dependencies>
<group>
<dependency id="Xamarin.Forms.Pages" version="$version$"/>
<dependency id="Newtonsoft.Json" version="10.0.3"/>
<dependency id="Microsoft.Azure.Mobile.Client" version="4.0.2" />
<dependency id="Newtonsoft.Json" version="12.0.3"/>
<dependency id="Microsoft.Azure.Mobile.Client" version="4.1.2" />
</group>
</dependencies>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion .nuspec/Xamarin.Forms.Pages.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<dependencies>
<group>
<dependency id="Xamarin.Forms" version="$version$"/>
<dependency id="Newtonsoft.Json" version="10.0.3"/>
<dependency id="Newtonsoft.Json" version="12.0.3"/>
</group>
</dependencies>
</metadata>
Expand Down
4 changes: 2 additions & 2 deletions .nuspec/Xamarin.Forms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
</group>
<group targetFramework="uap10.0.14393">
<dependency id="NETStandard.Library" version="2.0.1"/>
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.0.15" />
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.2.10" />
<dependency id="Win2D.uwp" version="1.20.0" />
<dependency id="Microsoft.UI.Xaml" version="2.1.190606001" />
<dependency id="System.ValueTuple" version="4.5.0" />
</group>
<group targetFramework="uap10.0.16299">
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.0.15" />
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.2.10" />
<dependency id="Win2D.uwp" version="1.20.0" />
<dependency id="Microsoft.UI.Xaml" version="2.4.2" />
</group>
Expand Down
2 changes: 1 addition & 1 deletion Git.Build.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<ItemGroup>
<PackageReference Include="GitInfo" Version="2.0.20" PrivateAssets="All" />
<PackageReference Include="GitInfo" Version="2.0.26" PrivateAssets="All" />
<PackageReference Include="MSBuilder.GenerateAssemblyInfo" Version="0.2.1" PrivateAssets="All" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Mobile.Client">
<Version>4.1.1</Version>
<Version>4.1.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.Bcl.Build">
<Version>1.0.21</Version>
Expand All @@ -136,7 +136,7 @@
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version>
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="System.AppContext">
<Version>4.3.0</Version>
Expand Down Expand Up @@ -283,4 +283,4 @@
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="28.0.0.3" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project>
</Project>
2 changes: 1 addition & 1 deletion PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.15</Version>
<Version>6.2.10</Version>
</PackageReference>
<PackageReference Include="Microsoft.UI.Xaml">
<Version>2.4.2</Version>
Expand Down
4 changes: 2 additions & 2 deletions PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Mobile.Client" Version="4.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Microsoft.Azure.Mobile.Client" Version="4.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
<AndroidResource Include="Resources\drawable\Icon.png" />
<AndroidResource Include="Resources\drawable\cover1.jpg" />
</ItemGroup>
<ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Forms.Controls\Xamarin.Forms.Controls.csproj">
<Project>{cb9c96ce-125c-4a68-b6a1-c3ff1fbf93e1}</Project>
<Name>Xamarin.Forms.Controls</Name>
Expand Down Expand Up @@ -342,7 +342,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version>
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>3.12.0</Version>
Expand Down Expand Up @@ -407,9 +407,9 @@
<SubType>Designer</SubType>
</AndroidResource>
</ItemGroup>
<ItemGroup Condition="Exists('Properties\MapsKey.cs')">
<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')" />
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<Reference Include="OpenTK" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,13 +255,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.9</Version>
<Version>6.2.10</Version>
</PackageReference>
<PackageReference Include="Microsoft.UI.Xaml">
<Version>2.4.2</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version>
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>3.12.0</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AdvancedColorPicker" Version="2.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NUnit">
<Version>3.12.0</Version>
</PackageReference>
Expand Down Expand Up @@ -440,4 +440,4 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<None Remove="Fonts\fa-regular-400.ttf" />
<None Remove="Fonts\PTM55FT.ttf" />
</ItemGroup>
<ItemGroup Condition="$(FromSource) == 'true'">
<ItemGroup Condition="$(FromSource) == 'true'">
<!-- A reference to the entire .NET Framework is automatically included -->
<ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
<ProjectReference Include="..\Xamarin.Forms.CustomAttributes\Xamarin.Forms.CustomAttributes.csproj" />
Expand All @@ -43,7 +43,7 @@
<EmbeddedResource Include="coffee.png" />
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
<EmbeddedResource Include="Fonts\CuteFont-Regular.ttf">
<SubType></SubType>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
<PackageReference Include="Xamarin.UITest" Version="3.0.6-dev1" />
<PackageReference Include="Xamarin.UITest" Version="3.0.7" />
<PackageReference Include="NUnit3TestAdapter">
<Version>3.15.1</Version>
</PackageReference>
Expand Down Expand Up @@ -91,4 +91,4 @@
</ItemGroup>
<Copy SourceFiles="@(_XamarinUITestFiles)" DestinationFolder="$(SolutionDir)packages\Xamarin.UITest.AnyVersion\%(RecursiveDir)" ContinueOnError="true" Retries="0" />
</Target>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
<PackageReference Include="Appium.WebDriver" Version="4.0.0.4-beta" />
<PackageReference Include="Castle.Core" Version="4.3.1" />
<PackageReference Include="DotNetSeleniumExtras.PageObjects" Version="3.11.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="Selenium.Support" Version="3.14.0" />
<PackageReference Include="Selenium.WebDriver" Version="3.14.0" />
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
<PackageReference Include="Xamarin.UITest" Version="3.0.6-dev1" />
<PackageReference Include="Xamarin.UITest" Version="3.0.7" />
<PackageReference Include="NUnit3TestAdapter">
<Version>3.15.1</Version>
</PackageReference>
Expand Down Expand Up @@ -97,4 +97,4 @@
</ItemGroup>
<Copy SourceFiles="@(_XamarinUITestFiles)" DestinationFolder="$(SolutionDir)packages\Xamarin.UITest.AnyVersion\%(RecursiveDir)" ContinueOnError="true" Retries="0" />
</Target>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
<PackageReference Include="Xamarin.UITest" Version="3.0.6-dev1" />
<PackageReference Include="Xamarin.UITest" Version="3.0.7" />
<PackageReference Include="NUnit3TestAdapter">
<Version>3.15.1</Version>
</PackageReference>
Expand Down Expand Up @@ -95,4 +95,4 @@
</ItemGroup>
<Copy SourceFiles="@(_XamarinUITestFiles)" DestinationFolder="$(SolutionDir)packages\Xamarin.UITest.AnyVersion\%(RecursiveDir)" ContinueOnError="true" Retries="0" />
</Target>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="ServiceStack.Client" Version="4.5.12" />
<PackageReference Include="ServiceStack.Interfaces" Version="4.5.12" />
<PackageReference Include="ServiceStack.Text" Version="4.5.12" />
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
<PackageReference Include="Xamarin.UITest" Version="3.0.6-dev1" />
<PackageReference Include="Xamarin.UITest" Version="3.0.7" />
<PackageReference Include="Xamarin.UITest.Desktop" Version="0.0.7" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -89,4 +89,4 @@
</ItemGroup>
<Copy SourceFiles="@(_XamarinUITestFiles)" DestinationFolder="$(SolutionDir)packages\Xamarin.UITest.AnyVersion\%(RecursiveDir)" ContinueOnError="true" Retries="0" />
</Target>
</Project>
</Project>
2 changes: 1 addition & 1 deletion Xamarin.Forms.Maps.GTK/Xamarin.Forms.Maps.GTK.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="FormsMaps.cs" />
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<EmbeddedResource Include="Properties\Xamarin.Forms.Maps.UWP.rd.xml" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Forms.Pages.Azure/Xamarin.Forms.Pages.Azure.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFrameworks>netstandard2.0;netstandard1.4</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Mobile.Client" Version="4.1.1">
<PackageReference Include="Microsoft.Azure.Mobile.Client" Version="4.1.2">
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter">
<Version>3.15.1</Version>
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.2">
<PackageReference Include="Newtonsoft.Json" Version="12.0.3">
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.9</Version>
<Version>6.2.10</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>3.12.0</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@
<Version>1.20.0</Version>
</PackageReference>
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<ProjectReference Include="..\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JetBrains.DotMemoryUnit" Version="3.0.20171219.105559" />
<PackageReference Include="JetBrains.DotMemoryUnit" Version="3.1.20200127.214830" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
Expand Down

0 comments on commit 50e72c7

Please sign in to comment.