From d9e96d6442998c67edbe6551f0af2709b2fc9442 Mon Sep 17 00:00:00 2001 From: Matthew Riley Date: Sat, 12 Mar 2016 16:47:15 -0800 Subject: [PATCH 1/5] Rename Net40 projects to Net45 No content changes yet. --- ...csproj => GoogleApis.Auth.PlatformServices.Tests_Net45.csproj} | 0 ...Net40.csproj => GoogleApis.Auth.PlatformServices_Net45.csproj} | 0 ...ices_Net40.csproj => GoogleApis.PlatformServices_Net45.csproj} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename Src/Support/GoogleApis.Auth.DotNet4.Tests/{GoogleApis.Auth.PlatformServices.Tests_Net40.csproj => GoogleApis.Auth.PlatformServices.Tests_Net45.csproj} (100%) rename Src/Support/GoogleApis.Auth.DotNet4/{GoogleApis.Auth.PlatformServices_Net40.csproj => GoogleApis.Auth.PlatformServices_Net45.csproj} (100%) rename Src/Support/GoogleApis.DotNet4/{GoogleApis.PlatformServices_Net40.csproj => GoogleApis.PlatformServices_Net45.csproj} (100%) diff --git a/Src/Support/GoogleApis.Auth.DotNet4.Tests/GoogleApis.Auth.PlatformServices.Tests_Net40.csproj b/Src/Support/GoogleApis.Auth.DotNet4.Tests/GoogleApis.Auth.PlatformServices.Tests_Net45.csproj similarity index 100% rename from Src/Support/GoogleApis.Auth.DotNet4.Tests/GoogleApis.Auth.PlatformServices.Tests_Net40.csproj rename to Src/Support/GoogleApis.Auth.DotNet4.Tests/GoogleApis.Auth.PlatformServices.Tests_Net45.csproj diff --git a/Src/Support/GoogleApis.Auth.DotNet4/GoogleApis.Auth.PlatformServices_Net40.csproj b/Src/Support/GoogleApis.Auth.DotNet4/GoogleApis.Auth.PlatformServices_Net45.csproj similarity index 100% rename from Src/Support/GoogleApis.Auth.DotNet4/GoogleApis.Auth.PlatformServices_Net40.csproj rename to Src/Support/GoogleApis.Auth.DotNet4/GoogleApis.Auth.PlatformServices_Net45.csproj diff --git a/Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net40.csproj b/Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net45.csproj similarity index 100% rename from Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net40.csproj rename to Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net45.csproj From 64e9dda9017f3dc831d436c186c54d516872f887 Mon Sep 17 00:00:00 2001 From: Matthew Riley Date: Sat, 12 Mar 2016 16:50:44 -0800 Subject: [PATCH 2/5] Remove support for .NET 4.0 Microsoft ended support for .NET 4.0 in January 2016: https://blogs.msdn.microsoft.com/dotnet/2015/12/09/support-ending-for-the-net-framework-4-4-5-and-4-5-1/ Removing support in our libraries and bringing anything framework- sensitive up to 4.5 will allow us to drop a lot of vestigial dependencies that have caused problems for, e.g., customers using us from DLLs. It also lays the groundwork for supporting .NET Core, since net40 and netcore50 share no PCL profiles in common. Even assuming customers aren't *running* on .NET 4.0, their projects may still *target* it by specifying a target framework. Those customers will not be able to use new versions of our NuGet packages without retargeting their apps. Old versions of the libraries will continue to work. In terms of implementation, the steps here were: * Rename _Net40 projects to _Net45 (done in previous commit to help with diffs) * Retarget any project that previously targeted 4.0 to 4.5. * Reinstall NuGet packages to rewrite targetFramework in packages.config and to update references in the project to net45 versions. The useful command here was: `Update-Package -ProjectName -Reinstall` * Remove dependencies on Nuget packages like Microsoft.Net.Http that are no longer necessary. * Fix a few uses of TaskEx from the now-removed BCL NuGet packages. * Remove now-unnecessary binding redirects from app.config. * Change Net45 projects to refer only to other Net45 projects, rather than PCLs. This should make it easier for customers to use our libraries from DLLs, since app.config won't be necessary to rewrite dependencies that differ between Net45 and PCL. * Retarget the PCL projects from net40 to net45: `Profile328` = `portable-net4+sl50+netcore45+wpa81+wp8` `Profile344` = `portable-net45+sl50+netcore45+wpa81+wp8` If we don't do this, the package will still support net40 but won't include the PlatformServices assemblies for net40. Customers would be upgraded to new libraries that might break their apps. * Update the .nuspec files to reflect new targets. --- ...s.Auth.PlatformServices.Tests_Net45.csproj | 78 ++---- .../GoogleApis.Auth.DotNet4.Tests/app.config | 21 +- .../packages.config | 10 +- ...gleApis.Auth.PlatformServices_Net45.csproj | 75 ++---- .../GoogleApis.Auth.DotNet4/app.config | 21 +- .../GoogleApis.Auth.DotNet4/packages.config | 10 +- .../Google.Apis.Auth.Mvc.nuspec | 6 +- .../GoogleApis.Auth.Mvc4.csproj | 82 ++---- Src/Support/GoogleApis.Auth.Mvc4/app.config | 21 +- .../GoogleApis.Auth.Mvc4/packages.config | 14 +- .../GoogleApis.Auth.Tests.csproj | 74 ++--- Src/Support/GoogleApis.Auth.Tests/app.config | 21 +- .../GoogleApis.Auth.Tests/packages.config | 10 +- .../GoogleApis.Auth/Google.Apis.Auth.nuspec | 22 +- .../Portable/GoogleApis.Auth_Portable.csproj | 46 ++-- .../GoogleApis.Auth/Portable/packages.config | 10 +- .../GoogleApis.Core/Google.Apis.Core.nuspec | 8 +- .../Portable/GoogleApis.Core_Portable.csproj | 34 ++- .../GoogleApis.Core/Portable/packages.config | 10 +- .../Apis/Util/Store/FileDataStore.cs | 6 +- .../GoogleApis.PlatformServices_Net45.csproj | 73 ++--- Src/Support/GoogleApis.DotNet4/app.config | 21 +- .../GoogleApis.DotNet4/packages.config | 6 +- .../Http/ConfigurableMessageHandlerTest.cs | 2 +- .../Apis/Requests/PageStreamerTest.cs | 2 +- .../GoogleApis.Tests/GoogleApis.Tests.csproj | 82 ++---- .../[Mock]/MockBackOffHandler.cs | 2 +- Src/Support/GoogleApis.Tests/app.config | 21 +- Src/Support/GoogleApis.Tests/packages.config | 14 +- Src/Support/GoogleApis/Google.Apis.nuspec | 24 +- .../Portable/GoogleApis_Portable.csproj | 49 ++-- .../GoogleApis/Portable/packages.config | 12 +- Src/Support/GoogleApisClient.sln | 252 +++++++++++------- 33 files changed, 454 insertions(+), 685 deletions(-) diff --git a/Src/Support/GoogleApis.Auth.DotNet4.Tests/GoogleApis.Auth.PlatformServices.Tests_Net45.csproj b/Src/Support/GoogleApis.Auth.DotNet4.Tests/GoogleApis.Auth.PlatformServices.Tests_Net45.csproj index 4e11aac9a8a..3414b9b4f81 100644 --- a/Src/Support/GoogleApis.Auth.DotNet4.Tests/GoogleApis.Auth.PlatformServices.Tests_Net45.csproj +++ b/Src/Support/GoogleApis.Auth.DotNet4.Tests/GoogleApis.Auth.PlatformServices.Tests_Net45.csproj @@ -9,10 +9,12 @@ Properties Google.Apis.Auth Google.Apis.Auth.DotNet4.Tests - v4.0 + v4.5 512 ..\..\ - 2eaf80c2 + + + true @@ -22,6 +24,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -30,6 +33,7 @@ TRACE prompt 4 + false bin\ReleaseSigned\ @@ -41,55 +45,26 @@ MinimumRecommendedRules.ruleset True ..\..\..\google.apis.snk + false - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - - - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - - + ..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll + True - False - ..\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll + True - + ..\packages\NUnit.2.6.3\lib\nunit.framework.dll + True - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll - - - False - ..\packages\Microsoft.Net.Http.2.2.29\lib\net40\System.Net.Http.dll - - - False - ..\packages\Microsoft.Net.Http.2.2.29\lib\net40\System.Net.Http.Extensions.dll - - - False - ..\packages\Microsoft.Net.Http.2.2.29\lib\net40\System.Net.Http.Primitives.dll - - - False - ..\packages\Microsoft.Net.Http.2.2.29\lib\net40\System.Net.Http.WebRequest.dll - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll - + + @@ -105,17 +80,17 @@ - + {8cfbf8d2-64cb-4703-a5b0-f9ef4de41fa7} - GoogleApis.Auth.PlatformServices_Net40 + GoogleApis.Auth.PlatformServices_Net45 - - {0aaaf32e-2bf0-49c5-bc2d-90874cfb5510} - GoogleApis.Auth_Portable + + {3ef3c1a9-a3cb-41c9-88c3-6b226ca051be} + GoogleApis.Auth_Net45 - - {db18f3a6-b16a-477b-a7b1-c2b116d1bfb0} - GoogleApis.Core_Portable + + {e83c6d98-c348-4944-ad7f-c4e428141079} + GoogleApis.Core_Net45 @@ -126,13 +101,6 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + @@ -36,13 +41,6 @@ - - - - - - - @@ -71,9 +69,9 @@ - - - + + + diff --git a/Src/Support/GoogleApis.Auth/Portable/GoogleApis.Auth_Portable.csproj b/Src/Support/GoogleApis.Auth/Portable/GoogleApis.Auth_Portable.csproj index c878fa6dbf0..58cdeb9da34 100644 --- a/Src/Support/GoogleApis.Auth/Portable/GoogleApis.Auth_Portable.csproj +++ b/Src/Support/GoogleApis.Auth/Portable/GoogleApis.Auth_Portable.csproj @@ -11,7 +11,7 @@ Google.Apis.Auth Google.Apis.Auth v4.0 - Profile328 + Profile344 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ @@ -35,7 +35,8 @@ false false true - 10e1c71c + + true @@ -84,46 +85,55 @@ - + + {db18f3a6-b16a-477b-a7b1-c2b116d1bfb0} + GoogleApis.Core_Portable + + + + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll + True - + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll + True - + ..\..\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True - + ..\..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll + True - + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll + True - + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll + True - + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll + True - + ..\..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll + True - + ..\..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll + True - - - {db18f3a6-b16a-477b-a7b1-c2b116d1bfb0} - GoogleApis.Core_Portable - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/Src/Support/GoogleApis.Auth/Portable/packages.config b/Src/Support/GoogleApis.Auth/Portable/packages.config index f51b8c75d5b..e9517c19e3b 100644 --- a/Src/Support/GoogleApis.Auth/Portable/packages.config +++ b/Src/Support/GoogleApis.Auth/Portable/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/Src/Support/GoogleApis.Core/Google.Apis.Core.nuspec b/Src/Support/GoogleApis.Core/Google.Apis.Core.nuspec index 953707b1d92..e9d2e8f381b 100644 --- a/Src/Support/GoogleApis.Core/Google.Apis.Core.nuspec +++ b/Src/Support/GoogleApis.Core/Google.Apis.Core.nuspec @@ -14,7 +14,7 @@ Supported Platforms: - - .NET Framework 4 + - .NET Framework 4.5 - Windows Store apps @@ -45,9 +45,9 @@ - - - + + + diff --git a/Src/Support/GoogleApis.Core/Portable/GoogleApis.Core_Portable.csproj b/Src/Support/GoogleApis.Core/Portable/GoogleApis.Core_Portable.csproj index 37401bd2a3d..a25129d6e31 100644 --- a/Src/Support/GoogleApis.Core/Portable/GoogleApis.Core_Portable.csproj +++ b/Src/Support/GoogleApis.Core/Portable/GoogleApis.Core_Portable.csproj @@ -11,7 +11,7 @@ Google Google.Apis.Core v4.0 - Profile328 + Profile344 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ @@ -35,7 +35,8 @@ false false true - 1bba247a + + true @@ -86,32 +87,41 @@ - + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll + True - + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll + True - + ..\..\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True - + ..\..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll + True - + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll + True - + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll + True - + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll + True - + ..\..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll + True - + ..\..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll + True @@ -119,7 +129,7 @@ - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/Src/Support/GoogleApis.Core/Portable/packages.config b/Src/Support/GoogleApis.Core/Portable/packages.config index f51b8c75d5b..e9517c19e3b 100644 --- a/Src/Support/GoogleApis.Core/Portable/packages.config +++ b/Src/Support/GoogleApis.Core/Portable/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/Src/Support/GoogleApis.DotNet4/Apis/Util/Store/FileDataStore.cs b/Src/Support/GoogleApis.DotNet4/Apis/Util/Store/FileDataStore.cs index c13d36c04e6..47b5cccff63 100644 --- a/Src/Support/GoogleApis.DotNet4/Apis/Util/Store/FileDataStore.cs +++ b/Src/Support/GoogleApis.DotNet4/Apis/Util/Store/FileDataStore.cs @@ -72,7 +72,7 @@ public Task StoreAsync(string key, T value) var serialized = NewtonsoftJsonSerializer.Instance.Serialize(value); var filePath = Path.Combine(folderPath, GenerateStoredKey(key, typeof(T))); File.WriteAllText(filePath, serialized); - return TaskEx.Delay(0); + return Task.Delay(0); } /// @@ -92,7 +92,7 @@ public Task DeleteAsync(string key) { File.Delete(filePath); } - return TaskEx.Delay(0); + return Task.Delay(0); } /// @@ -141,7 +141,7 @@ public Task ClearAsync() Directory.CreateDirectory(folderPath); } - return TaskEx.Delay(0); + return Task.Delay(0); } /// Creates a unique stored key based on the key and the class type. diff --git a/Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net45.csproj b/Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net45.csproj index f3cc5c6bfdc..496bd45206a 100644 --- a/Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net45.csproj +++ b/Src/Support/GoogleApis.DotNet4/GoogleApis.PlatformServices_Net45.csproj @@ -9,10 +9,12 @@ Properties Google Google.Apis.PlatformServices - v4.0 + v4.5 512 ..\..\ - 36e46efa + + + true @@ -22,6 +24,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -31,6 +34,7 @@ prompt 4 Google.Apis.PlatformServices.xml + false bin\ReleaseSigned\ @@ -43,52 +47,18 @@ MinimumRecommendedRules.ruleset True ..\..\..\google.apis.snk + false - False ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - - - False - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - - - False - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - - - False - ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + True - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll - - - False - ..\packages\Microsoft.Net.Http.2.2.29\lib\net40\System.Net.Http.dll - - - False - ..\packages\Microsoft.Net.Http.2.2.29\lib\net40\System.Net.Http.Extensions.dll - - - False - ..\packages\Microsoft.Net.Http.2.2.29\lib\net40\System.Net.Http.Primitives.dll - - - False - ..\packages\Microsoft.Net.Http.2.2.29\lib\net40\System.Net.Http.WebRequest.dll - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll - - - ..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll - + + @@ -104,27 +74,22 @@ - + + Designer + - - {db18f3a6-b16a-477b-a7b1-c2b116d1bfb0} - GoogleApis.Core_Portable + + {e83c6d98-c348-4944-ad7f-c4e428141079} + GoogleApis.Core_Net45 - - {826cf988-eee8-4b75-8f53-b7e851a17baa} - GoogleApis_Portable + + {e06dcdd2-b8e0-4bf0-b572-a825e8dc1fa2} + GoogleApis_Net45 - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + @@ -38,13 +43,6 @@ - - - - - - - @@ -73,9 +71,9 @@ - - - + + + diff --git a/Src/Support/GoogleApis/Portable/GoogleApis_Portable.csproj b/Src/Support/GoogleApis/Portable/GoogleApis_Portable.csproj index 7a3dd36457a..c0c84b7027e 100644 --- a/Src/Support/GoogleApis/Portable/GoogleApis_Portable.csproj +++ b/Src/Support/GoogleApis/Portable/GoogleApis_Portable.csproj @@ -11,7 +11,7 @@ Google Google.Apis v4.0 - Profile328 + Profile344 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ @@ -35,7 +35,8 @@ false false true - 5808034f + + true @@ -88,49 +89,59 @@ - + + {db18f3a6-b16a-477b-a7b1-c2b116d1bfb0} + GoogleApis.Core_Portable + + + + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll + True - + ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll + True - + ..\..\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll + True - + ..\..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.IO.dll + True - + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll + True - + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll + True - + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll + True - + ..\..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.Runtime.dll + True - + ..\..\packages\Microsoft.Bcl.1.1.10\lib\portable-net40+sl5+win8+wp8+wpa81\System.Threading.Tasks.dll + True - + ..\..\packages\Zlib.Portable.Signed.1.11.0\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll + True - - - {db18f3a6-b16a-477b-a7b1-c2b116d1bfb0} - GoogleApis.Core_Portable - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/Src/Support/GoogleApis/Portable/packages.config b/Src/Support/GoogleApis/Portable/packages.config index 6966e7d62f1..7025e106df4 100644 --- a/Src/Support/GoogleApis/Portable/packages.config +++ b/Src/Support/GoogleApis/Portable/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/Src/Support/GoogleApisClient.sln b/Src/Support/GoogleApisClient.sln index 265cd1d328f..5fa331bf1d9 100644 --- a/Src/Support/GoogleApisClient.sln +++ b/Src/Support/GoogleApisClient.sln @@ -5,10 +5,6 @@ VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Tests", "GoogleApis.Tests\GoogleApis.Tests.csproj", "{9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.PlatformServices_Net40", "GoogleApis.DotNet4\GoogleApis.PlatformServices_Net40.csproj", "{C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Auth.PlatformServices_Net40", "GoogleApis.Auth.DotNet4\GoogleApis.Auth.PlatformServices_Net40.csproj", "{8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Auth.Tests", "GoogleApis.Auth.Tests\GoogleApis.Auth.Tests.csproj", "{548D6C9B-A97B-4316-91AC-9AAD35202884}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Auth.Mvc4", "GoogleApis.Auth.Mvc4\GoogleApis.Auth.Mvc4.csproj", "{B700243A-2FAC-454B-8858-47635BFA71C6}" @@ -25,8 +21,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.PlatformServices EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Auth.PlatformServices_Wpa81", "GoogleApis.Auth.WP81\GoogleApis.Auth.PlatformServices_Wpa81.csproj", "{90660B22-B933-44A6-B34D-E4F4352D4434}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Auth.PlatformServices.Tests_Net40", "GoogleApis.Auth.DotNet4.Tests\GoogleApis.Auth.PlatformServices.Tests_Net40.csproj", "{5A731729-8E99-4930-AE77-FA3524673DA3}" -EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "GoogleApis_Shared", "GoogleApis\GoogleApis_Shared.shproj", "{0E73CB06-DE95-493E-8DE3-114E41DDD0C9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis_Net45", "GoogleApis\Net45\GoogleApis_Net45.csproj", "{E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}" @@ -47,6 +41,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Auth_Net45", "Go EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{53189F27-5960-4300-955F-FDF1780F02A8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.PlatformServices_Net45", "GoogleApis.DotNet4\GoogleApis.PlatformServices_Net45.csproj", "{C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Auth.PlatformServices_Net45", "GoogleApis.Auth.DotNet4\GoogleApis.Auth.PlatformServices_Net45.csproj", "{8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GoogleApis.Auth.PlatformServices.Tests_Net45", "GoogleApis.Auth.DotNet4.Tests\GoogleApis.Auth.PlatformServices.Tests_Net45.csproj", "{5A731729-8E99-4930-AE77-FA3524673DA3}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution GoogleApis.Core\GoogleApis.Core_Shared.projitems*{db18f3a6-b16a-477b-a7b1-c2b116d1bfb0}*SharedItemsImports = 4 @@ -118,70 +118,6 @@ Global {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|Win32.ActiveCfg = Release|Any CPU {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|x64.ActiveCfg = Release|Any CPU {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|x86.ActiveCfg = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|ARM.ActiveCfg = Debug|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|Win32.ActiveCfg = Debug|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|x64.ActiveCfg = Debug|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|x86.ActiveCfg = Debug|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|Any CPU.Build.0 = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|ARM.ActiveCfg = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|Win32.ActiveCfg = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|x64.ActiveCfg = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|x86.ActiveCfg = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|Any CPU.ActiveCfg = ReleaseSigned|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|Any CPU.Build.0 = ReleaseSigned|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|ARM.ActiveCfg = ReleaseSigned|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|x86.ActiveCfg = ReleaseSigned|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|Any CPU.ActiveCfg = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|Any CPU.Build.0 = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|ARM.ActiveCfg = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|Mixed Platforms.Build.0 = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|Win32.ActiveCfg = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|x64.ActiveCfg = Release|Any CPU - {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|x86.ActiveCfg = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|ARM.ActiveCfg = Debug|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|Win32.ActiveCfg = Debug|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|x64.ActiveCfg = Debug|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|x86.ActiveCfg = Debug|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|Any CPU.Build.0 = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|ARM.ActiveCfg = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|Win32.ActiveCfg = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|x64.ActiveCfg = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|x86.ActiveCfg = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|Any CPU.ActiveCfg = ReleaseSigned|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|Any CPU.Build.0 = ReleaseSigned|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|ARM.ActiveCfg = ReleaseSigned|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|x86.ActiveCfg = ReleaseSigned|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|Any CPU.ActiveCfg = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|Any CPU.Build.0 = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|ARM.ActiveCfg = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|Mixed Platforms.Build.0 = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|Win32.ActiveCfg = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|x64.ActiveCfg = Release|Any CPU - {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|x86.ActiveCfg = Release|Any CPU {548D6C9B-A97B-4316-91AC-9AAD35202884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {548D6C9B-A97B-4316-91AC-9AAD35202884}.Debug|Any CPU.Build.0 = Debug|Any CPU {548D6C9B-A97B-4316-91AC-9AAD35202884}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -512,38 +448,6 @@ Global {90660B22-B933-44A6-B34D-E4F4352D4434}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU {90660B22-B933-44A6-B34D-E4F4352D4434}.ReleaseTravis|x86.ActiveCfg = ReleaseSigned|x86 {90660B22-B933-44A6-B34D-E4F4352D4434}.ReleaseTravis|x86.Build.0 = ReleaseSigned|x86 - {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|ARM.ActiveCfg = Debug|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|Win32.ActiveCfg = Debug|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|x64.ActiveCfg = Debug|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|x86.ActiveCfg = Debug|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|Any CPU.Build.0 = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|ARM.ActiveCfg = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|Win32.ActiveCfg = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|x64.ActiveCfg = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|x86.ActiveCfg = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|Any CPU.ActiveCfg = ReleaseSigned|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|Any CPU.Build.0 = ReleaseSigned|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|ARM.ActiveCfg = ReleaseSigned|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|x86.ActiveCfg = ReleaseSigned|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|Any CPU.ActiveCfg = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|Any CPU.Build.0 = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|ARM.ActiveCfg = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|Mixed Platforms.Build.0 = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|Win32.ActiveCfg = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|x64.ActiveCfg = Release|Any CPU - {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|x86.ActiveCfg = Release|Any CPU {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -832,6 +736,150 @@ Global {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|x64.Build.0 = ReleaseSigned|Any CPU {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|x86.ActiveCfg = ReleaseSigned|Any CPU {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|x86.Build.0 = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|ARM.ActiveCfg = Debug|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|ARM.Build.0 = Debug|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|Win32.ActiveCfg = Debug|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|Win32.Build.0 = Debug|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|x64.ActiveCfg = Debug|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|x64.Build.0 = Debug|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|x86.ActiveCfg = Debug|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Debug|x86.Build.0 = Debug|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|Any CPU.Build.0 = Release|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|ARM.ActiveCfg = Release|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|ARM.Build.0 = Release|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|Win32.ActiveCfg = Release|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|Win32.Build.0 = Release|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|x64.ActiveCfg = Release|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|x64.Build.0 = Release|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|x86.ActiveCfg = Release|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.Release|x86.Build.0 = Release|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|Any CPU.ActiveCfg = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|Any CPU.Build.0 = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|ARM.ActiveCfg = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|ARM.Build.0 = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|Win32.Build.0 = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|x64.Build.0 = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|x86.ActiveCfg = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseSigned|x86.Build.0 = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|Any CPU.ActiveCfg = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|x64.Build.0 = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|x86.ActiveCfg = ReleaseSigned|Any CPU + {C4DA0ABE-2C2E-4BB8-9881-5FF80B0C1AFD}.ReleaseTravis|x86.Build.0 = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|ARM.ActiveCfg = Debug|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|ARM.Build.0 = Debug|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|Win32.ActiveCfg = Debug|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|Win32.Build.0 = Debug|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|x64.ActiveCfg = Debug|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|x64.Build.0 = Debug|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|x86.ActiveCfg = Debug|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Debug|x86.Build.0 = Debug|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|Any CPU.Build.0 = Release|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|ARM.ActiveCfg = Release|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|ARM.Build.0 = Release|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|Win32.ActiveCfg = Release|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|Win32.Build.0 = Release|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|x64.ActiveCfg = Release|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|x64.Build.0 = Release|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|x86.ActiveCfg = Release|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.Release|x86.Build.0 = Release|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|Any CPU.ActiveCfg = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|Any CPU.Build.0 = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|ARM.ActiveCfg = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|ARM.Build.0 = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|Win32.Build.0 = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|x64.Build.0 = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|x86.ActiveCfg = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseSigned|x86.Build.0 = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|Any CPU.ActiveCfg = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|x64.Build.0 = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|x86.ActiveCfg = ReleaseSigned|Any CPU + {8CFBF8D2-64CB-4703-A5B0-F9EF4DE41FA7}.ReleaseTravis|x86.Build.0 = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|ARM.ActiveCfg = Debug|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|ARM.Build.0 = Debug|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|Win32.ActiveCfg = Debug|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|Win32.Build.0 = Debug|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|x64.ActiveCfg = Debug|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|x64.Build.0 = Debug|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|x86.ActiveCfg = Debug|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Debug|x86.Build.0 = Debug|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|Any CPU.Build.0 = Release|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|ARM.ActiveCfg = Release|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|ARM.Build.0 = Release|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|Win32.ActiveCfg = Release|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|Win32.Build.0 = Release|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|x64.ActiveCfg = Release|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|x64.Build.0 = Release|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|x86.ActiveCfg = Release|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.Release|x86.Build.0 = Release|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|Any CPU.ActiveCfg = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|Any CPU.Build.0 = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|ARM.ActiveCfg = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|ARM.Build.0 = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|Win32.ActiveCfg = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|Win32.Build.0 = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|x64.ActiveCfg = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|x64.Build.0 = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|x86.ActiveCfg = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseSigned|x86.Build.0 = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|Any CPU.ActiveCfg = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|x64.Build.0 = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|x86.ActiveCfg = ReleaseSigned|Any CPU + {5A731729-8E99-4930-AE77-FA3524673DA3}.ReleaseTravis|x86.Build.0 = ReleaseSigned|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 94fcaf4a6886ee4205e2847c90d7a416c964beb9 Mon Sep 17 00:00:00 2001 From: Matthew Riley Date: Sun, 13 Mar 2016 03:26:43 -0700 Subject: [PATCH 3/5] ReleaseTravis should use ReleaseSigned for projects it builds When the solution builds the ReleaseTravis target, the new Net45 projects build for ReleaseSigned, but all existing projects were configured to build in Release. The new Net45 projects failed to compile because they were taking a dependency on non-strongnamed assemblies. Now that the signing key is available in GitHub, Travis should build everything in ReleaseSigned. --- Src/Support/GoogleApisClient.sln | 48 ++++++++++++++++---------------- travis.sh | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Src/Support/GoogleApisClient.sln b/Src/Support/GoogleApisClient.sln index 5fa331bf1d9..616fdbb111c 100644 --- a/Src/Support/GoogleApisClient.sln +++ b/Src/Support/GoogleApisClient.sln @@ -113,8 +113,8 @@ Global {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|Any CPU.ActiveCfg = Release|Any CPU {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|Any CPU.Build.0 = Release|Any CPU {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|ARM.ActiveCfg = Release|Any CPU - {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|Any CPU - {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|Mixed Platforms.Build.0 = Release|Any CPU + {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|Win32.ActiveCfg = Release|Any CPU {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|x64.ActiveCfg = Release|Any CPU {9A8AA9EF-6904-43D8-8A26-0AB62069C2DC}.ReleaseTravis|x86.ActiveCfg = Release|Any CPU @@ -145,8 +145,8 @@ Global {548D6C9B-A97B-4316-91AC-9AAD35202884}.ReleaseTravis|Any CPU.ActiveCfg = Release|Any CPU {548D6C9B-A97B-4316-91AC-9AAD35202884}.ReleaseTravis|Any CPU.Build.0 = Release|Any CPU {548D6C9B-A97B-4316-91AC-9AAD35202884}.ReleaseTravis|ARM.ActiveCfg = Release|Any CPU - {548D6C9B-A97B-4316-91AC-9AAD35202884}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|Any CPU - {548D6C9B-A97B-4316-91AC-9AAD35202884}.ReleaseTravis|Mixed Platforms.Build.0 = Release|Any CPU + {548D6C9B-A97B-4316-91AC-9AAD35202884}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {548D6C9B-A97B-4316-91AC-9AAD35202884}.ReleaseTravis|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU {548D6C9B-A97B-4316-91AC-9AAD35202884}.ReleaseTravis|Win32.ActiveCfg = Release|Any CPU {548D6C9B-A97B-4316-91AC-9AAD35202884}.ReleaseTravis|x64.ActiveCfg = Release|Any CPU {548D6C9B-A97B-4316-91AC-9AAD35202884}.ReleaseTravis|x86.ActiveCfg = Release|Any CPU @@ -177,8 +177,8 @@ Global {B700243A-2FAC-454B-8858-47635BFA71C6}.ReleaseTravis|Any CPU.ActiveCfg = Release|Any CPU {B700243A-2FAC-454B-8858-47635BFA71C6}.ReleaseTravis|Any CPU.Build.0 = Release|Any CPU {B700243A-2FAC-454B-8858-47635BFA71C6}.ReleaseTravis|ARM.ActiveCfg = Release|Any CPU - {B700243A-2FAC-454B-8858-47635BFA71C6}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|Any CPU - {B700243A-2FAC-454B-8858-47635BFA71C6}.ReleaseTravis|Mixed Platforms.Build.0 = Release|Any CPU + {B700243A-2FAC-454B-8858-47635BFA71C6}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {B700243A-2FAC-454B-8858-47635BFA71C6}.ReleaseTravis|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU {B700243A-2FAC-454B-8858-47635BFA71C6}.ReleaseTravis|Win32.ActiveCfg = Release|Any CPU {B700243A-2FAC-454B-8858-47635BFA71C6}.ReleaseTravis|x64.ActiveCfg = Release|Any CPU {B700243A-2FAC-454B-8858-47635BFA71C6}.ReleaseTravis|x86.ActiveCfg = Release|Any CPU @@ -219,7 +219,7 @@ Global {39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU {39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|ARM {39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|ARM - {39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|x86 + {39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|x86 {39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|x86 {39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|x86 {39E1EC7C-3C05-44E4-A19F-A61BF6EA9B11}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU @@ -262,7 +262,7 @@ Global {430E4403-12E3-4CF0-8E2A-CE83D0948497}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU {430E4403-12E3-4CF0-8E2A-CE83D0948497}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|ARM {430E4403-12E3-4CF0-8E2A-CE83D0948497}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|ARM - {430E4403-12E3-4CF0-8E2A-CE83D0948497}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|x86 + {430E4403-12E3-4CF0-8E2A-CE83D0948497}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|x86 {430E4403-12E3-4CF0-8E2A-CE83D0948497}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|x86 {430E4403-12E3-4CF0-8E2A-CE83D0948497}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|x86 {430E4403-12E3-4CF0-8E2A-CE83D0948497}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU @@ -308,7 +308,7 @@ Global {B1D5B962-3E98-46D4-992E-C6491E4E8A02}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU {B1D5B962-3E98-46D4-992E-C6491E4E8A02}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|ARM {B1D5B962-3E98-46D4-992E-C6491E4E8A02}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|ARM - {B1D5B962-3E98-46D4-992E-C6491E4E8A02}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|x86 + {B1D5B962-3E98-46D4-992E-C6491E4E8A02}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|x86 {B1D5B962-3E98-46D4-992E-C6491E4E8A02}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|x86 {B1D5B962-3E98-46D4-992E-C6491E4E8A02}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|x86 {B1D5B962-3E98-46D4-992E-C6491E4E8A02}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|x64 @@ -355,7 +355,7 @@ Global {9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU {9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|ARM {9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|ARM - {9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|x86 + {9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|x86 {9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|x86 {9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|x86 {9CBB9EC3-C678-4FB7-889B-DED6DE1F06B6}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|x64 @@ -399,7 +399,7 @@ Global {176657CD-57F0-4358-B358-ED8B90D8AF39}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU {176657CD-57F0-4358-B358-ED8B90D8AF39}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|ARM {176657CD-57F0-4358-B358-ED8B90D8AF39}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|ARM - {176657CD-57F0-4358-B358-ED8B90D8AF39}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|x86 + {176657CD-57F0-4358-B358-ED8B90D8AF39}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|x86 {176657CD-57F0-4358-B358-ED8B90D8AF39}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|x86 {176657CD-57F0-4358-B358-ED8B90D8AF39}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|x86 {176657CD-57F0-4358-B358-ED8B90D8AF39}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU @@ -442,7 +442,7 @@ Global {90660B22-B933-44A6-B34D-E4F4352D4434}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU {90660B22-B933-44A6-B34D-E4F4352D4434}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|ARM {90660B22-B933-44A6-B34D-E4F4352D4434}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|ARM - {90660B22-B933-44A6-B34D-E4F4352D4434}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|x86 + {90660B22-B933-44A6-B34D-E4F4352D4434}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|x86 {90660B22-B933-44A6-B34D-E4F4352D4434}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|x86 {90660B22-B933-44A6-B34D-E4F4352D4434}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|x86 {90660B22-B933-44A6-B34D-E4F4352D4434}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU @@ -488,8 +488,8 @@ Global {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|Any CPU {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|Any CPU - {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|Any CPU - {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.ReleaseTravis|Mixed Platforms.Build.0 = Release|Any CPU + {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.ReleaseTravis|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|Any CPU {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|Any CPU {E06DCDD2-B8E0-4BF0-B572-A825E8DC1FA2}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU @@ -536,8 +536,8 @@ Global {826CF988-EEE8-4B75-8F53-B7E851A17BAA}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU {826CF988-EEE8-4B75-8F53-B7E851A17BAA}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|Any CPU {826CF988-EEE8-4B75-8F53-B7E851A17BAA}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|Any CPU - {826CF988-EEE8-4B75-8F53-B7E851A17BAA}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|Any CPU - {826CF988-EEE8-4B75-8F53-B7E851A17BAA}.ReleaseTravis|Mixed Platforms.Build.0 = Release|Any CPU + {826CF988-EEE8-4B75-8F53-B7E851A17BAA}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {826CF988-EEE8-4B75-8F53-B7E851A17BAA}.ReleaseTravis|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU {826CF988-EEE8-4B75-8F53-B7E851A17BAA}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|Any CPU {826CF988-EEE8-4B75-8F53-B7E851A17BAA}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|Any CPU {826CF988-EEE8-4B75-8F53-B7E851A17BAA}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU @@ -584,8 +584,8 @@ Global {DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU {DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|Any CPU {DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|Any CPU - {DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|Any CPU - {DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.ReleaseTravis|Mixed Platforms.Build.0 = Release|Any CPU + {DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.ReleaseTravis|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU {DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|Any CPU {DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|Any CPU {DB18F3A6-B16A-477B-A7B1-C2B116D1BFB0}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU @@ -632,8 +632,8 @@ Global {E83C6D98-C348-4944-AD7F-C4E428141079}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU {E83C6D98-C348-4944-AD7F-C4E428141079}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|Any CPU {E83C6D98-C348-4944-AD7F-C4E428141079}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|Any CPU - {E83C6D98-C348-4944-AD7F-C4E428141079}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|Any CPU - {E83C6D98-C348-4944-AD7F-C4E428141079}.ReleaseTravis|Mixed Platforms.Build.0 = Release|Any CPU + {E83C6D98-C348-4944-AD7F-C4E428141079}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {E83C6D98-C348-4944-AD7F-C4E428141079}.ReleaseTravis|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU {E83C6D98-C348-4944-AD7F-C4E428141079}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|Any CPU {E83C6D98-C348-4944-AD7F-C4E428141079}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|Any CPU {E83C6D98-C348-4944-AD7F-C4E428141079}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU @@ -680,8 +680,8 @@ Global {0AAAF32E-2BF0-49C5-BC2D-90874CFB5510}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU {0AAAF32E-2BF0-49C5-BC2D-90874CFB5510}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|Any CPU {0AAAF32E-2BF0-49C5-BC2D-90874CFB5510}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|Any CPU - {0AAAF32E-2BF0-49C5-BC2D-90874CFB5510}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|Any CPU - {0AAAF32E-2BF0-49C5-BC2D-90874CFB5510}.ReleaseTravis|Mixed Platforms.Build.0 = Release|Any CPU + {0AAAF32E-2BF0-49C5-BC2D-90874CFB5510}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {0AAAF32E-2BF0-49C5-BC2D-90874CFB5510}.ReleaseTravis|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU {0AAAF32E-2BF0-49C5-BC2D-90874CFB5510}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|Any CPU {0AAAF32E-2BF0-49C5-BC2D-90874CFB5510}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|Any CPU {0AAAF32E-2BF0-49C5-BC2D-90874CFB5510}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU @@ -728,8 +728,8 @@ Global {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|Any CPU.Build.0 = ReleaseSigned|Any CPU {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|ARM.ActiveCfg = ReleaseSigned|Any CPU {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|ARM.Build.0 = ReleaseSigned|Any CPU - {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|Mixed Platforms.ActiveCfg = Release|Any CPU - {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|Mixed Platforms.Build.0 = Release|Any CPU + {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|Mixed Platforms.ActiveCfg = ReleaseSigned|Any CPU + {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|Mixed Platforms.Build.0 = ReleaseSigned|Any CPU {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|Win32.ActiveCfg = ReleaseSigned|Any CPU {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|Win32.Build.0 = ReleaseSigned|Any CPU {3EF3C1A9-A3CB-41C9-88C3-6B226CA051BE}.ReleaseTravis|x64.ActiveCfg = ReleaseSigned|Any CPU diff --git a/travis.sh b/travis.sh index 095926efdc9..50cbb8a5eee 100755 --- a/travis.sh +++ b/travis.sh @@ -13,7 +13,7 @@ cd Src/Support # as they are tricky to build under Mono. xbuild /p:Configuration=ReleaseTravis GoogleApisClient.sln -OUTDIR=bin/Release +OUTDIR=bin/ReleaseSigned mono "${NUNIT}" \ "GoogleApis.Tests/${OUTDIR}/Google.Apis.Tests.dll" \ From 2aad279c5e9d1736002ac2bf4d4d524cda9f35e1 Mon Sep 17 00:00:00 2001 From: Matthew Riley Date: Sun, 13 Mar 2016 04:22:35 -0700 Subject: [PATCH 4/5] Fix cancellation tests that expect TaskCanceledException These tests relied on cancellation behavior of the HTTP client from the Microsoft.Net.Http NuGet package. Now that they use the framework implementation, the tests' expectations about what exception they'll see -- and how it will be returned -- need to change. Since our implementation calls ThrowIfCancellationRequested(), it has always been possible that we'd return OperationCanceledException as we now see in the tests. This doesn't indicate a breaking change. --- .../Apis/Download/MediaDownloaderTest.cs | 9 ++++++++- .../GoogleApis.Tests/Apis/Upload/ResumableUploadTest.cs | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Src/Support/GoogleApis.Tests/Apis/Download/MediaDownloaderTest.cs b/Src/Support/GoogleApis.Tests/Apis/Download/MediaDownloaderTest.cs index 2fab3d5e88d..1d024c96eec 100644 --- a/Src/Support/GoogleApis.Tests/Apis/Download/MediaDownloaderTest.cs +++ b/Src/Support/GoogleApis.Tests/Apis/Download/MediaDownloaderTest.cs @@ -240,7 +240,14 @@ private void Subtest_Download_Chunks(int chunkSize, bool sync = true, int cancel { var result = downloader.DownloadAsync(downloadUri, outputStream, handler.CancellationTokenSource.Token).Result; - Assert.AreEqual(0, handler.CancelRequestNum); + if (result.Exception == null) + { + Assert.AreEqual(0, handler.CancelRequestNum); + } + else + { + Assert.IsInstanceOf(result.Exception); + } } catch (AggregateException ex) { diff --git a/Src/Support/GoogleApis.Tests/Apis/Upload/ResumableUploadTest.cs b/Src/Support/GoogleApis.Tests/Apis/Upload/ResumableUploadTest.cs index 073aa1771c4..f18887adff3 100644 --- a/Src/Support/GoogleApis.Tests/Apis/Upload/ResumableUploadTest.cs +++ b/Src/Support/GoogleApis.Tests/Apis/Upload/ResumableUploadTest.cs @@ -985,11 +985,11 @@ private void TestChunkUploadFail_Cancel(int cancelRequest) try { var result = upload.UploadAsync(handler.CancellationTokenSource.Token).Result; - Assert.Fail("Upload should be canceled"); + Assert.IsInstanceOf(result.Exception, "Upload should have been canceled"); } catch (AggregateException ex) { - Assert.IsInstanceOf(ex.InnerException); + Assert.IsInstanceOf(ex.InnerException, "Upload should have been canceled"); } Assert.That(handler.Calls, Is.EqualTo(cancelRequest)); From b4da4fd2744f6338af31d3e94d2b26f02d3d6ffd Mon Sep 17 00:00:00 2001 From: Matthew Riley Date: Sun, 13 Mar 2016 05:45:19 -0700 Subject: [PATCH 5/5] Fix test failure on Mono Mono's HttpHeaders.Add rejects valid values for ETag that we use in our tests. https://bugzilla.xamarin.com/show_bug.cgi?id=39569 --- Src/Support/GoogleApis/Apis/Requests/BatchRequest.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Src/Support/GoogleApis/Apis/Requests/BatchRequest.cs b/Src/Support/GoogleApis/Apis/Requests/BatchRequest.cs index f82a0160d3e..a609793d35c 100644 --- a/Src/Support/GoogleApis/Apis/Requests/BatchRequest.cs +++ b/Src/Support/GoogleApis/Apis/Requests/BatchRequest.cs @@ -283,7 +283,14 @@ internal static HttpResponseMessage ParseAsHttpResponse(string content) { headers = response.Content.Headers; } - headers.Add(keyValue.Key, keyValue.Value); + + // Use TryAddWithoutValidation rather than Add because Mono's validation is + // improperly strict. https://bugzilla.xamarin.com/show_bug.cgi?id=39569 + if (!headers.TryAddWithoutValidation(keyValue.Key, keyValue.Value)) + { + throw new FormatException(String.Format( + "Could not parse header {0} from batch reply", keyValue.Key)); + } } // TODO(peleyal): ContentLength header is x while the "real" content that we read from the stream is