-
-
Save rolfbjarne/4763fcb947bfdcc4410cdf0c30129fe5 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit c91a077dc7fbcc8d1c03bd719c7bad9b9c63978e | |
Author: Rolf Bjarne Kvinge <rolf@xamarin.com> | |
Date: Wed Apr 10 09:44:16 2019 +0200 | |
tmp | |
diff --git a/watchOS/WatchKitCatalog/WatchApp3/WatchApp3.csproj b/watchOS/WatchKitCatalog/WatchApp3/WatchApp3.csproj | |
index 18cf52be..31c86132 100644 | |
--- a/watchOS/WatchKitCatalog/WatchApp3/WatchApp3.csproj | |
+++ b/watchOS/WatchKitCatalog/WatchApp3/WatchApp3.csproj | |
@@ -128,5 +128,10 @@ <?xml version="1.0" encoding="utf-8"?> | |
<IsAppExtension>True</IsAppExtension> | |
</ProjectReference> | |
</ItemGroup> | |
+ <ItemGroup> | |
+ <PackageReference Include="Newtonsoft.Json"> | |
+ <Version>11.0.2</Version> | |
+ </PackageReference> | |
+ </ItemGroup> | |
<Import Project="$(MSBuildExtensionsPath)\Xamarin\WatchOS\Xamarin.WatchOS.App.CSharp.targets" /> | |
</Project> | |
\ No newline at end of file | |
diff --git a/watchOS/WatchKitCatalog/WatchKit3Extension/WatchKit3Extension.csproj b/watchOS/WatchKitCatalog/WatchKit3Extension/WatchKit3Extension.csproj | |
index 7b8e5e6c..bff12628 100644 | |
--- a/watchOS/WatchKitCatalog/WatchKit3Extension/WatchKit3Extension.csproj | |
+++ b/watchOS/WatchKitCatalog/WatchKit3Extension/WatchKit3Extension.csproj | |
@@ -72,9 +72,6 @@ <?xml version="1.0" encoding="utf-8"?> | |
<Reference Include="System.Xml" /> | |
<Reference Include="System.Core" /> | |
<Reference Include="Xamarin.WatchOS" /> | |
- <Reference Include="Newtonsoft.Json"> | |
- <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath> | |
- </Reference> | |
</ItemGroup> | |
<ItemGroup> | |
<Folder Include="Resources\" /> | |
@@ -87,7 +84,6 @@ <?xml version="1.0" encoding="utf-8"?> | |
<ItemGroup> | |
<None Include="Info.plist" /> | |
<None Include="Entitlements.plist" /> | |
- <None Include="packages.config" /> | |
</ItemGroup> | |
<ItemGroup> | |
<Compile Include="Initial Interface Controller\InterfaceController.cs" /> | |
@@ -167,6 +163,11 @@ <?xml version="1.0" encoding="utf-8"?> | |
<BundleResource Include="NotificationPayload.json" /> | |
<BundleResource Include="Media\Ski1.m4v" /> | |
</ItemGroup> | |
+ <ItemGroup> | |
+ <PackageReference Include="Newtonsoft.Json"> | |
+ <Version>11.0.2</Version> | |
+ </PackageReference> | |
+ </ItemGroup> | |
<Import Project="$(MSBuildExtensionsPath)\Xamarin\WatchOS\Xamarin.WatchOS.AppExtension.CSharp.targets" /> | |
<ItemGroup> | |
<ImageAsset Include="Resources\Images.xcassets\Bumblebee.imageset\Bumblebee%402x.png" /> | |
diff --git a/watchOS/WatchKitCatalog/WatchKit3Extension/packages.config b/watchOS/WatchKitCatalog/WatchKit3Extension/packages.config | |
deleted file mode 100644 | |
index c8b3f681..00000000 | |
--- a/watchOS/WatchKitCatalog/WatchKit3Extension/packages.config | |
+++ /dev/null | |
@@ -1,4 +0,0 @@ | |
-<?xml version="1.0" encoding="utf-8"?> | |
-<packages> | |
- <package id="Newtonsoft.Json" version="9.0.1" targetFramework="xamarinwatchos10" /> | |
-</packages> | |
\ No newline at end of file | |
diff --git a/watchOS/WatchKitCatalog/WatchKitCatalog/WatchKitCatalog.csproj b/watchOS/WatchKitCatalog/WatchKitCatalog/WatchKitCatalog.csproj | |
index 6ce2a65c..92691744 100644 | |
--- a/watchOS/WatchKitCatalog/WatchKitCatalog/WatchKitCatalog.csproj | |
+++ b/watchOS/WatchKitCatalog/WatchKitCatalog/WatchKitCatalog.csproj | |
@@ -90,12 +90,18 @@ <?xml version="1.0" encoding="utf-8"?> | |
<DependentUpon>WatchKitCatalogViewController.cs</DependentUpon> | |
</Compile> | |
</ItemGroup> | |
+ <ItemGroup> | |
+ <PackageReference Include="Newtonsoft.Json"> | |
+ <Version>11.0.2</Version> | |
+ </PackageReference> | |
+ </ItemGroup> | |
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> | |
<ItemGroup> | |
<ProjectReference Include="..\WatchApp3\WatchApp3.csproj"> | |
<Project>{79EB034F-3D29-43A5-B89F-124879504771}</Project> | |
<Name>WatchApp3</Name> | |
<IsWatchApp>True</IsWatchApp> | |
+ <ReferenceOutputAssembly>False</ReferenceOutputAssembly> | |
</ProjectReference> | |
</ItemGroup> | |
<ItemGroup> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment