From 0fb0d52a4c5732eb254e1f778835a28efddccf5f Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Wed, 5 Sep 2012 19:40:44 -0400
Subject: [PATCH] Made a separate ApiInteraction solution with
 platform-specific builds

---
 .../MediaBrowser.ApiInteraction.Metro.csproj  |  66 +++
 .../Properties/AssemblyInfo.cs                |  30 +
 MediaBrowser.ApiInteraction.sln               |  37 ++
 MediaBrowser.ApiInteraction/ApiClient.cs      |  30 +-
 MediaBrowser.ApiInteraction/DataSerializer.cs |  49 ++
 .../IDataSerializer.cs                        |  22 -
 .../MediaBrowser.ApiInteraction.csproj        |  32 +-
 .../Properties/AssemblyInfo.cs                |  12 +-
 MediaBrowser.ApiInteraction/packages.config   |   4 +
 .../MediaBrowser.Common.csproj                |   5 +-
 MediaBrowser.Common/packages.config           |   1 -
 .../MediaBrowser.Controller.csproj            |   5 +-
 MediaBrowser.Controller/packages.config       |   1 -
 MediaBrowser.Model/MediaBrowser.Model.csproj  |   2 +-
 MediaBrowser.sln                              |   9 -
 UpgradeLog.XML                                | Bin 0 -> 1660 bytes
 UpgradeLog.htm                                | Bin 0 -> 13778 bytes
 _UpgradeReport_Files/UpgradeReport.css        | 118 ++++
 _UpgradeReport_Files/UpgradeReport.xslt       | 538 ++++++++++++++++++
 _UpgradeReport_Files/UpgradeReport_Error.png  | Bin 0 -> 338 bytes
 .../UpgradeReport_Information.png             | Bin 0 -> 306 bytes
 .../UpgradeReport_Success.png                 | Bin 0 -> 381 bytes
 .../UpgradeReport_Warning.png                 | Bin 0 -> 292 bytes
 23 files changed, 886 insertions(+), 75 deletions(-)
 create mode 100644 MediaBrowser.ApiInteraction.Metro/MediaBrowser.ApiInteraction.Metro.csproj
 create mode 100644 MediaBrowser.ApiInteraction.Metro/Properties/AssemblyInfo.cs
 create mode 100644 MediaBrowser.ApiInteraction.sln
 create mode 100644 MediaBrowser.ApiInteraction/DataSerializer.cs
 delete mode 100644 MediaBrowser.ApiInteraction/IDataSerializer.cs
 create mode 100644 MediaBrowser.ApiInteraction/packages.config
 create mode 100644 UpgradeLog.XML
 create mode 100644 UpgradeLog.htm
 create mode 100644 _UpgradeReport_Files/UpgradeReport.css
 create mode 100644 _UpgradeReport_Files/UpgradeReport.xslt
 create mode 100644 _UpgradeReport_Files/UpgradeReport_Error.png
 create mode 100644 _UpgradeReport_Files/UpgradeReport_Information.png
 create mode 100644 _UpgradeReport_Files/UpgradeReport_Success.png
 create mode 100644 _UpgradeReport_Files/UpgradeReport_Warning.png

diff --git a/MediaBrowser.ApiInteraction.Metro/MediaBrowser.ApiInteraction.Metro.csproj b/MediaBrowser.ApiInteraction.Metro/MediaBrowser.ApiInteraction.Metro.csproj
new file mode 100644
index 000000000..216ba19ab
--- /dev/null
+++ b/MediaBrowser.ApiInteraction.Metro/MediaBrowser.ApiInteraction.Metro.csproj
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{94CEA07A-307C-4663-AA43-7BD852808574}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MediaBrowser.ApiInteraction.Metro</RootNamespace>
+    <AssemblyName>MediaBrowser.ApiInteraction.Metro</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- A reference to the entire .NET Framework is automatically included -->
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
+      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
+      <Name>MediaBrowser.Model</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\MediaBrowser.ApiInteraction\ApiClient.cs">
+      <Link>ApiClient.cs</Link>
+    </Compile>
+    <Compile Include="..\MediaBrowser.ApiInteraction\DataSerializer.cs">
+      <Link>DataSerializer.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="protobuf-net">
+      <HintPath>..\protobuf-net\Full\netcore45\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Text">
+      <HintPath>..\packages\ServiceStack.Text.3.9.5\lib\sl5\ServiceStack.Text.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/MediaBrowser.ApiInteraction.Metro/Properties/AssemblyInfo.cs b/MediaBrowser.ApiInteraction.Metro/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..c9c876bc8
--- /dev/null
+++ b/MediaBrowser.ApiInteraction.Metro/Properties/AssemblyInfo.cs
@@ -0,0 +1,30 @@
+using System.Resources;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MediaBrowser.ApiInteraction.Metro")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("MediaBrowser.ApiInteraction.Metro")]
+[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MediaBrowser.ApiInteraction.sln b/MediaBrowser.ApiInteraction.sln
new file mode 100644
index 000000000..4484801a2
--- /dev/null
+++ b/MediaBrowser.ApiInteraction.sln
@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Model", "MediaBrowser.Model\MediaBrowser.Model.csproj", "{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.ApiInteraction", "MediaBrowser.ApiInteraction\MediaBrowser.ApiInteraction.csproj", "{921C0F64-FDA7-4E9F-9E73-0CB0EEDB2422}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F0E0E64C-2A6F-4E35-9533-D53AC07C2CD1}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\packages.config = .nuget\packages.config
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.ApiInteraction.Metro", "MediaBrowser.ApiInteraction.Metro\MediaBrowser.ApiInteraction.Metro.csproj", "{94CEA07A-307C-4663-AA43-7BD852808574}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{921C0F64-FDA7-4E9F-9E73-0CB0EEDB2422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{921C0F64-FDA7-4E9F-9E73-0CB0EEDB2422}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{921C0F64-FDA7-4E9F-9E73-0CB0EEDB2422}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{921C0F64-FDA7-4E9F-9E73-0CB0EEDB2422}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94CEA07A-307C-4663-AA43-7BD852808574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94CEA07A-307C-4663-AA43-7BD852808574}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94CEA07A-307C-4663-AA43-7BD852808574}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94CEA07A-307C-4663-AA43-7BD852808574}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/MediaBrowser.ApiInteraction/ApiClient.cs b/MediaBrowser.ApiInteraction/ApiClient.cs
index 18d6ddc21..8e3327f01 100644
--- a/MediaBrowser.ApiInteraction/ApiClient.cs
+++ b/MediaBrowser.ApiInteraction/ApiClient.cs
@@ -18,6 +18,8 @@ namespace MediaBrowser.ApiInteraction
             handler.AutomaticDecompression = DecompressionMethods.Deflate;
 
             HttpClient = new HttpClient(handler);
+
+            DataSerializer.Configure();
         }
 
         /// <summary>
@@ -48,24 +50,11 @@ namespace MediaBrowser.ApiInteraction
         {
             get
             {
-                // First try Protobuf since it has the best performance
-                if (DataSerializer.CanDeserializeProtobuf)
-                {
-                    return ApiInteraction.SerializationFormat.Protobuf;
-                }
-
-                // Next best is jsv
-                if (DataSerializer.CanDeserializeJsv)
-                {
-                    return ApiInteraction.SerializationFormat.Jsv;
-                }
-
-                return ApiInteraction.SerializationFormat.Json;
+                return ApiInteraction.SerializationFormat.Jsv;
             }
         }
 
         public HttpClient HttpClient { get; private set; }
-        public IDataSerializer DataSerializer { get; set; }
 
         /// <summary>
         /// Gets an image url that can be used to download an image from the api
@@ -597,7 +586,7 @@ namespace MediaBrowser.ApiInteraction
             string url = ApiUrl + "/ServerConfiguration";
 
             // At the moment this can't be retrieved in protobuf format
-            SerializationFormat format = DataSerializer.CanDeserializeJsv ? SerializationFormat.Jsv : ApiInteraction.SerializationFormat.Json;
+            SerializationFormat format = SerializationFormat.Jsv;
 
             using (Stream stream = await GetSerializedStreamAsync(url, format).ConfigureAwait(false))
             {
@@ -613,7 +602,7 @@ namespace MediaBrowser.ApiInteraction
             string url = ApiUrl + "/PluginConfiguration?assemblyfilename=" + plugin.AssemblyFileName;
 
             // At the moment this can't be retrieved in protobuf format
-            SerializationFormat format = DataSerializer.CanDeserializeJsv ? SerializationFormat.Jsv : ApiInteraction.SerializationFormat.Json;
+            SerializationFormat format = SerializationFormat.Jsv;
 
             using (Stream stream = await GetSerializedStreamAsync(url, format).ConfigureAwait(false))
             {
@@ -708,7 +697,7 @@ namespace MediaBrowser.ApiInteraction
         {
             if (format == ApiInteraction.SerializationFormat.Protobuf)
             {
-                return DataSerializer.DeserializeProtobufFromStream(stream, type);
+                throw new NotImplementedException();
             }
             if (format == ApiInteraction.SerializationFormat.Jsv)
             {
@@ -731,11 +720,4 @@ namespace MediaBrowser.ApiInteraction
             HttpClient.Dispose();
         }
     }
-
-    public enum SerializationFormat
-    {
-        Json,
-        Jsv,
-        Protobuf
-    }
 }
diff --git a/MediaBrowser.ApiInteraction/DataSerializer.cs b/MediaBrowser.ApiInteraction/DataSerializer.cs
new file mode 100644
index 000000000..15039cd45
--- /dev/null
+++ b/MediaBrowser.ApiInteraction/DataSerializer.cs
@@ -0,0 +1,49 @@
+using System;
+using System.IO;
+using ProtoBuf;
+using ServiceStack.Text;
+
+namespace MediaBrowser.ApiInteraction
+{
+    public static class DataSerializer
+    {
+        public static T DeserializeJsonFromStream<T>(Stream stream)
+        {
+            return JsonSerializer.DeserializeFromStream<T>(stream);
+        }
+
+        public static T DeserializeJsvFromStream<T>(Stream stream)
+        {
+            return TypeSerializer.DeserializeFromStream<T>(stream);
+        }
+
+        public static object DeserializeJsvFromStream(Stream stream, Type type)
+        {
+            return TypeSerializer.DeserializeFromStream(type, stream);
+        }
+
+        public static object DeserializeJsonFromStream(Stream stream, Type type)
+        {
+            return JsonSerializer.DeserializeFromStream(type, stream);
+        }
+        
+        public static T DeserializeProtobufFromStream<T>(Stream stream)
+        {
+            return Serializer.Deserialize<T>(stream);
+        }
+
+        public static void Configure()
+        {
+            JsConfig.DateHandler = ServiceStack.Text.JsonDateHandler.ISO8601;
+            JsConfig.ExcludeTypeInfo = true;
+            JsConfig.IncludeNullValues = false;
+        }
+    }
+
+    public enum SerializationFormat
+    {
+        Json,
+        Jsv,
+        Protobuf
+    }
+}
diff --git a/MediaBrowser.ApiInteraction/IDataSerializer.cs b/MediaBrowser.ApiInteraction/IDataSerializer.cs
deleted file mode 100644
index 33bac96df..000000000
--- a/MediaBrowser.ApiInteraction/IDataSerializer.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.IO;
-
-namespace MediaBrowser.ApiInteraction
-{
-    /// <summary>
-    /// Since ServiceStack Json is not portable, we need to abstract required json functions into an interface
-    /// </summary>
-    public interface IDataSerializer
-    {
-        T DeserializeJsonFromStream<T>(Stream stream);
-        T DeserializeJsvFromStream<T>(Stream stream);
-        T DeserializeProtobufFromStream<T>(Stream stream);
-
-        object DeserializeJsonFromStream(Stream stream, Type type);
-        object DeserializeJsvFromStream(Stream stream, Type type);
-        object DeserializeProtobufFromStream(Stream stream, Type type);
-
-        bool CanDeserializeJsv { get; }
-        bool CanDeserializeProtobuf { get; }
-    }
-}
diff --git a/MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj b/MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj
index 93c6acec9..62a60f86c 100644
--- a/MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj
+++ b/MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj
@@ -4,15 +4,13 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B1C27231-7017-4C9B-A678-DE891954FA38}</ProjectGuid>
+    <ProjectGuid>{921C0F64-FDA7-4E9F-9E73-0CB0EEDB2422}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MediaBrowser.ApiInteraction</RootNamespace>
     <AssemblyName>MediaBrowser.ApiInteraction</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -32,18 +30,36 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
+    <Reference Include="protobuf-net">
+      <HintPath>..\protobuf-net\Full\net30\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Text">
+      <HintPath>..\packages\ServiceStack.Text.3.9.5\lib\net35\ServiceStack.Text.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ApiClient.cs" />
+    <Compile Include="DataSerializer.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
       <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
       <Name>MediaBrowser.Model</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ApiClient.cs" />
-    <Compile Include="IDataSerializer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/MediaBrowser.ApiInteraction/Properties/AssemblyInfo.cs b/MediaBrowser.ApiInteraction/Properties/AssemblyInfo.cs
index a788c5f71..5dd263f0a 100644
--- a/MediaBrowser.ApiInteraction/Properties/AssemblyInfo.cs
+++ b/MediaBrowser.ApiInteraction/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
-using System.Resources;
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -14,7 +13,14 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("Copyright ©  2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("677618f2-de4b-44f4-8dfd-a90176297ee2")]
 
 // Version information for an assembly consists of the following four values:
 //
diff --git a/MediaBrowser.ApiInteraction/packages.config b/MediaBrowser.ApiInteraction/packages.config
new file mode 100644
index 000000000..c9218be3c
--- /dev/null
+++ b/MediaBrowser.ApiInteraction/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ServiceStack.Text" version="3.9.5" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index aa5c1b561..2697acf72 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -39,9 +39,8 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="protobuf-net, Version=2.0.0.580, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\protobuf-net.2.0.0.580\lib\net40\protobuf-net.dll</HintPath>
+    <Reference Include="protobuf-net">
+      <HintPath>..\protobuf-net\Full\net30\protobuf-net.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Text, Version=3.9.5.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/MediaBrowser.Common/packages.config b/MediaBrowser.Common/packages.config
index 60910df1c..bb1c2f20a 100644
--- a/MediaBrowser.Common/packages.config
+++ b/MediaBrowser.Common/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MahApps.Metro" version="0.9.0.0" targetFramework="net45" />
-  <package id="protobuf-net" version="2.0.0.580" targetFramework="net45" />
   <package id="Rx-Core" version="2.0.20823" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.0.20823" targetFramework="net45" />
   <package id="Rx-Linq" version="2.0.20823" targetFramework="net45" />
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 1547deea2..c5046b9c6 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -30,9 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="protobuf-net, Version=2.0.0.580, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\protobuf-net.2.0.0.580\lib\net40\protobuf-net.dll</HintPath>
+    <Reference Include="protobuf-net">
+      <HintPath>..\protobuf-net\Full\net30\protobuf-net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
diff --git a/MediaBrowser.Controller/packages.config b/MediaBrowser.Controller/packages.config
index bb0f05911..42f16a267 100644
--- a/MediaBrowser.Controller/packages.config
+++ b/MediaBrowser.Controller/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="protobuf-net" version="2.0.0.580" targetFramework="net45" />
   <package id="Rx-Core" version="2.0.20823" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.0.20823" targetFramework="net45" />
   <package id="Rx-Linq" version="2.0.20823" targetFramework="net45" />
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 668fd8f5b..98904a6b6 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -65,7 +65,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="protobuf-net">
-      <HintPath>..\packages\protobuf-net.2.0.0.580\lib\sl4\protobuf-net.dll</HintPath>
+      <HintPath>..\protobuf-net\Full\portable\protobuf-net.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index b37685812..c97592868 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Common", "Medi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Model", "MediaBrowser.Model\MediaBrowser.Model.csproj", "{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.ApiInteraction", "MediaBrowser.ApiInteraction\MediaBrowser.ApiInteraction.csproj", "{B1C27231-7017-4C9B-A678-DE891954FA38}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.ServerApplication", "MediaBrowser.ServerApplication\MediaBrowser.ServerApplication.csproj", "{156EA256-AD2D-4D2F-B116-2ED4B9EFD869}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.WebDashboard", "MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj", "{5624B7B5-B5A7-41D8-9F10-CC5611109619}"
@@ -68,15 +66,8 @@ Global
 		{92B9F802-4415-438F-90E1-44602135EA41}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92B9F802-4415-438F-90E1-44602135EA41}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92B9F802-4415-438F-90E1-44602135EA41}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1C27231-7017-4C9B-A678-DE891954FA38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1C27231-7017-4C9B-A678-DE891954FA38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1C27231-7017-4C9B-A678-DE891954FA38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1C27231-7017-4C9B-A678-DE891954FA38}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 EndGlobal
diff --git a/UpgradeLog.XML b/UpgradeLog.XML
new file mode 100644
index 0000000000000000000000000000000000000000..f3acc69667b1ff041b4e1fc5db0f70ff70b92561
GIT binary patch
literal 1660
zcmdUv-ER_65XH~4iT}f<5B3Qb5I?9wqu3@UYKW!r#iZe5D^%DeyVUAGul~;6MR<W1
zo(y64?#$dXXU?6ue}2E#xqfP?g(Ce>qFjaM%9N_B6E#&=gLi}{)dc$#Z>n#>d##}^
zRU_&-G3V-Oi&g_?tzY0KtY$nDzN27UvF_@Wbwcj7Vx9$&r}$?uNOT+gH@en}T)9T%
zP4t=n3Jy7YZpb{Z(BlJf^$L3pddYA<W>1gxh#CfD$jD?h)?{%7aj5PhXp~}&bb;4#
zxjqnK?G{0mR?w@&xWhUj+FE{OZS_Wa8}>bb>I`+gA=g~*(bbB$TJI@Op{_4@Uj)o6
zvfbmK5OqA_*CQF#;ZeZN8r%hb@8DHn&EdZKSAm%hLkC1uw&J(IKViM8G13Em+h(Cd
zye?R6uuBcMy%SabF&NfxN~}B9IJQKrGteXY$cm*z)cG2Oeku1DEvG;I-sCf{RNt$8
zd3alINBCTvHw~CM6SL)ihG$098pdaIN=(mYWLy$&H8MD5>|0~=3@wSch3h6?OlP{*
zDW}?0OHb9&Gd&^068kIu<z(91+_4uL<Lg%ay6LqcRk?S48b-Bx=4zdGF&Eh9A!mab
zX*1`Y9sdM&hx{XuyL8YMc|PszE68QffT#PSJiC6VdR1vQCa-Jv{jg<}QCnAic)Wy3
zpQqO~)MzkkUbT6*_|@<=DsMmdIz(Ltb(&05o39h*wVdXd2<zwR@(s29+CRhI?|#{>
c;rNL&=KnjxzMsnO-JYXw_x(yAx|e(U3s&$XqW}N^

literal 0
HcmV?d00001

diff --git a/UpgradeLog.htm b/UpgradeLog.htm
new file mode 100644
index 0000000000000000000000000000000000000000..383ccd3513abff0294cfe01302200fb9eba84bbb
GIT binary patch
literal 13778
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
F{{ZNF%-H|{

literal 0
HcmV?d00001

diff --git a/_UpgradeReport_Files/UpgradeReport.css b/_UpgradeReport_Files/UpgradeReport.css
new file mode 100644
index 000000000..1f0cd1ffc
--- /dev/null
+++ b/_UpgradeReport_Files/UpgradeReport.css
@@ -0,0 +1,118 @@
+/* Body style, for the entire document */
+body
+{
+    background: #F3F3F4;
+    color: #1E1E1F;
+    font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+    padding: 0;
+    margin: 0;
+}
+
+/* Header1 style, used for the main title */
+h1
+{
+    padding: 10px 0px 10px 10px;
+    font-size: 21pt;
+    background-color: #E2E2E2;
+    border-bottom: 1px #C1C1C2 solid; 
+    color: #201F20;
+    margin: 0;
+    font-weight: normal;
+}
+
+/* Header2 style, used for "Overview" and other sections */
+h2
+{
+    font-size: 18pt;
+    font-weight: normal;
+    padding: 15px 0 5px 0;
+    margin: 0;
+}
+
+/* Header3 style, used for sub-sections, such as project name */
+h3
+{
+    font-weight: normal;
+    font-size: 15pt;
+    margin: 0;
+    padding: 15px 0 5px 0;
+    background-color: transparent;
+}
+
+/* Color all hyperlinks one color */
+a
+{
+    color: #1382CE;
+}
+
+/* Table styles */ 
+table
+{
+    border-spacing: 0 0;
+    border-collapse: collapse;
+    font-size: 10pt;
+}
+
+table th
+{
+    background: #E7E7E8;
+    text-align: left;
+    text-decoration: none;
+    font-weight: normal;
+    padding: 3px 6px 3px 6px;
+}
+
+table td
+{
+    vertical-align: top;
+    padding: 3px 6px 5px 5px;
+    margin: 0px;
+    border: 1px solid #E7E7E8;
+    background: #F7F7F8;
+}
+
+/* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
+.localLink
+{
+    color: #1E1E1F;
+    background: #EEEEED;
+    text-decoration: none;
+}
+
+.localLink:hover
+{
+    color: #1382CE;
+    background: #FFFF99;
+    text-decoration: none;
+}
+
+/* Center text, used in the over views cells that contain message level counts */ 
+.textCentered
+{
+    text-align: center;
+}
+
+/* The message cells in message tables should take up all avaliable space */
+.messageCell
+{
+    width: 100%;
+}
+
+/* Padding around the content after the h1 */ 
+#content 
+{
+	padding: 0px 12px 12px 12px; 
+}
+
+/* The overview table expands to width, with a max width of 97% */ 
+#overview table
+{
+    width: auto;
+    max-width: 75%; 
+}
+
+/* The messages tables are always 97% width */
+#messages table
+{
+    width: 97%;
+}
\ No newline at end of file
diff --git a/_UpgradeReport_Files/UpgradeReport.xslt b/_UpgradeReport_Files/UpgradeReport.xslt
new file mode 100644
index 000000000..acf18c33f
--- /dev/null
+++ b/_UpgradeReport_Files/UpgradeReport.xslt
@@ -0,0 +1,538 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:msxsl='urn:schemas-microsoft-com:xslt'>
+  <xsl:output omit-xml-declaration="yes" /> 
+
+  <!-- Keys -->
+  <xsl:key name="ProjectKey" match="Event" use="@Project" />
+
+  <!-- String split template -->
+  <xsl:template name="SplitString">
+    <xsl:param name="source"      select="''" />
+    <xsl:param name="separator" select="','" />
+    <xsl:if test="not($source = '' or $separator = '')">
+      <xsl:variable name="head" select="substring-before(concat($source, $separator), $separator)" />
+      <xsl:variable name="tail" select="substring-after($source, $separator)" />
+      <part>
+        <xsl:value-of select="$head"/>
+      </part>
+      <xsl:call-template name="SplitString">
+        <xsl:with-param name="source" select="$tail" />
+        <xsl:with-param name="separator" select="$separator" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <!-- Intermediate Templates -->
+  <xsl:template match="UpgradeReport" mode="ProjectOverviewXML">
+    <Projects>
+      <xsl:for-each select="Event[generate-id(.) = generate-id(key('ProjectKey', @Project))]">
+        <Project>
+          <xsl:variable name="pNode" select="current()" />
+          <xsl:variable name="errorCount" select="count(../Event[@Project = current()/@Project and @ErrorLevel=2])" />
+          <xsl:variable name="warningCount" select="count(../Event[@Project = current()/@Project and @ErrorLevel=1])" />
+          <xsl:variable name="messageCount" select="count(../Event[@Project = current()/@Project and @ErrorLevel=0])" />
+          <xsl:variable name="pathSplitSeparator">
+            <xsl:text>\</xsl:text>
+          </xsl:variable>
+          <xsl:variable name="projectName">
+            <xsl:choose>
+              <xsl:when test="@Project = ''">Solution</xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="@Project"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:variable>
+          <xsl:attribute name="IsSolution">
+            <xsl:value-of select="@Project = ''"/>
+          </xsl:attribute>
+          <xsl:attribute name="Project">
+            <xsl:value-of select="$projectName"/>
+          </xsl:attribute>
+          <xsl:attribute name="ProjectDisplayName">
+            <!-- Sometimes it is possible to have project name set to a path over a real project name,
+                 we split the string on '\' and if we end up with >1 part in the resulting tokens set
+                 we format the ProjectDisplayName as ..\prior\last -->
+            <xsl:variable name="pathTokens">
+              <xsl:call-template name="SplitString">
+                <xsl:with-param name="source" select="$projectName" />
+                <xsl:with-param name="separator" select="$pathSplitSeparator" />
+              </xsl:call-template>
+            </xsl:variable>
+
+            <xsl:choose>
+              <xsl:when test="count(msxsl:node-set($pathTokens)/part) > 1">
+                <xsl:value-of select="concat('..', $pathSplitSeparator, msxsl:node-set($pathTokens)/part[last() - 1], $pathSplitSeparator, msxsl:node-set($pathTokens)/part[last()])"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="$projectName"/>
+              </xsl:otherwise>
+            </xsl:choose>
+
+          </xsl:attribute>
+          <xsl:attribute name="ProjectSafeName">
+            <xsl:value-of select="translate($projectName, '\', '-')"/>
+          </xsl:attribute>
+          <xsl:attribute name="Solution">
+            <xsl:value-of select="/UpgradeReport/Properties/Property[@Name='Solution']/@Value"/>
+          </xsl:attribute>
+          <xsl:attribute name="Source">
+            <xsl:value-of select="@Source"/>
+          </xsl:attribute>
+          <xsl:attribute name="Status">
+            <xsl:choose>
+              <xsl:when test="$errorCount > 0">Error</xsl:when>
+              <xsl:when test="$warningCount > 0">Warning</xsl:when>
+              <xsl:otherwise>Success</xsl:otherwise>
+            </xsl:choose>
+          </xsl:attribute>
+          <xsl:attribute name="ErrorCount">
+            <xsl:value-of select="$errorCount" />
+          </xsl:attribute>
+          <xsl:attribute name="WarningCount">
+            <xsl:value-of select="$warningCount" />
+          </xsl:attribute>
+          <xsl:attribute name="MessageCount">
+            <xsl:value-of select="$messageCount" />
+          </xsl:attribute>
+          <xsl:attribute name="TotalCount">
+            <xsl:value-of select="$errorCount + $warningCount + $messageCount"/>
+          </xsl:attribute>
+          <xsl:for-each select="../Event[@Project = $pNode/@Project and @ErrorLevel=3]">
+            <ConversionStatus>
+              <xsl:value-of select="@Description"/>
+            </ConversionStatus>
+          </xsl:for-each>
+          <Messages>
+            <xsl:for-each select="../Event[@Project = $pNode/@Project and @ErrorLevel&lt;3]">
+              <Message>
+                <xsl:attribute name="Level">
+                  <xsl:value-of select="@ErrorLevel" />
+                </xsl:attribute>
+                <xsl:attribute name="Status">
+                  <xsl:choose>
+                    <xsl:when test="@ErrorLevel = 0">Message</xsl:when>
+                    <xsl:when test="@ErrorLevel = 1">Warning</xsl:when>
+                    <xsl:when test="@ErrorLevel = 2">Error</xsl:when>
+                    <xsl:otherwise>Message</xsl:otherwise>
+                  </xsl:choose>
+                </xsl:attribute>
+                <xsl:attribute name="Source">
+                  <xsl:value-of select="@Source"/>
+                </xsl:attribute>
+                <xsl:attribute name="Message">
+                  <xsl:value-of select="@Description"/>
+                </xsl:attribute>
+              </Message>
+            </xsl:for-each>
+          </Messages>
+        </Project>
+      </xsl:for-each>
+    </Projects>
+  </xsl:template>
+
+
+
+  <!-- Project Overview template -->
+  <xsl:template match="Projects" mode="ProjectOverview">
+
+    <table>
+      <tr>
+        <th></th>
+        <th _locID="ProjectTableHeader">Project</th>
+        <th _locID="PathTableHeader">Path</th>
+        <th _locID="ErrorsTableHeader">Errors</th>
+        <th _locID="WarningsTableHeader">Warnings</th>
+        <th _locID="MessagesTableHeader">Messages</th>
+      </tr>
+
+        <xsl:for-each select="Project">
+
+          <xsl:sort select="@ErrorCount" order="descending" />
+          <xsl:sort select="@WarningCount" order="descending" />
+          <!-- Always make solution last within a group -->
+          <xsl:sort select="@IsSolution" order="ascending" />
+          <xsl:sort select="@ProjectSafeName" order="ascending" />
+
+          <tr>
+            <td>
+              <img width="16" height="16">
+                <xsl:attribute name="src">
+                  <xsl:choose>
+                    <xsl:when test="@Status = 'Error'">_UpgradeReport_Files\UpgradeReport_Error.png</xsl:when>
+                    <xsl:when test="@Status = 'Warning'">_UpgradeReport_Files\UpgradeReport_Warning.png</xsl:when>
+                    <xsl:when test="@Status = 'Success'">_UpgradeReport_Files\UpgradeReport_Success.png</xsl:when>
+                  </xsl:choose>
+                </xsl:attribute>
+                <xsl:attribute name="alt">
+                  <xsl:value-of select="@Status" />
+                </xsl:attribute>
+              </img>
+            </td>
+            <td>
+              <strong>
+                <a>
+                  <xsl:attribute name="href">
+                    <xsl:value-of select="concat('#', @ProjectSafeName)"/>
+                  </xsl:attribute>
+                  <xsl:value-of select="@ProjectDisplayName" />
+                </a>
+              </strong>
+            </td>
+            <td>
+              <xsl:value-of select="@Source" />
+            </td>
+            <td class="textCentered">
+              <a>
+                <xsl:if test="@ErrorCount > 0">
+                  <xsl:attribute name="href">
+                    <xsl:value-of select="concat('#', @ProjectSafeName, 'Error')"/>
+                  </xsl:attribute>
+                </xsl:if>
+                <xsl:value-of select="@ErrorCount" />
+              </a>
+            </td>
+            <td class="textCentered">
+              <a>
+                <xsl:if test="@WarningCount > 0">
+                  <xsl:attribute name="href">
+                    <xsl:value-of select="concat('#', @ProjectSafeName, 'Warning')"/>
+                  </xsl:attribute>
+                </xsl:if>
+                <xsl:value-of select="@WarningCount" />
+              </a>
+            </td>
+            <td class="textCentered">
+              <a href="#">
+                <xsl:if test="@MessageCount > 0">
+                  <xsl:attribute name="onclick">
+                    <xsl:variable name="apos">
+                      <xsl:text>'</xsl:text>
+                    </xsl:variable>
+                    <xsl:variable name="JS" select="concat('ScrollToFirstVisibleMessage(', $apos, @ProjectSafeName, $apos, ')')" />
+                    <xsl:value-of select="concat($JS, '; return false;')"/>
+                  </xsl:attribute>
+                </xsl:if>
+                <xsl:value-of select="@MessageCount" />
+              </a>
+            </td>
+          </tr>
+        </xsl:for-each>
+    </table>
+  </xsl:template>
+
+  <!-- Show messages row -->
+  <xsl:template match="Project" mode="ProjectShowMessages">
+    <tr>
+      <xsl:attribute name="name">
+        <xsl:value-of select="concat('MessageRowHeaderShow', @ProjectSafeName)"/>
+      </xsl:attribute>
+      <td>
+        <img width="16" height="16" src="_UpgradeReport_Files\UpgradeReport_Information.png" />
+      </td>
+      <td class="messageCell">
+        <xsl:variable name="apos">
+          <xsl:text>'</xsl:text>
+        </xsl:variable>
+        <xsl:variable name="toggleRowsJS" select="concat('ToggleMessageVisibility(', $apos, @ProjectSafeName, $apos, ')')" />
+
+        <a _locID="ShowAdditionalMessages" href="#">
+          <xsl:attribute name="name">
+            <xsl:value-of select="concat(@ProjectSafeName, 'Message')"/>
+          </xsl:attribute>
+          <xsl:attribute name="onclick">
+            <xsl:value-of select="concat($toggleRowsJS, '; return false;')"/>
+          </xsl:attribute>
+          Show <xsl:value-of select="@MessageCount" /> additional messages
+        </a>
+      </td>
+    </tr>
+  </xsl:template>
+
+  <!-- Hide messages row -->
+  <xsl:template match="Project" mode="ProjectHideMessages">
+    <tr style="display: none">
+      <xsl:attribute name="name">
+        <xsl:value-of select="concat('MessageRowHeaderHide', @ProjectSafeName)"/>
+      </xsl:attribute>
+      <td>
+        <img width="16" height="16" src="_UpgradeReport_Files\UpgradeReport_Information.png" />
+      </td>
+      <td class="messageCell">
+        <xsl:variable name="apos">
+          <xsl:text>'</xsl:text>
+        </xsl:variable>
+        <xsl:variable name="toggleRowsJS" select="concat('ToggleMessageVisibility(', $apos, @ProjectSafeName, $apos, ')')" />
+
+        <a _locID="HideAdditionalMessages" href="#">
+          <xsl:attribute name="name">
+            <xsl:value-of select="concat(@ProjectSafeName, 'Message')"/>
+          </xsl:attribute>
+          <xsl:attribute name="onclick">
+            <xsl:value-of select="concat($toggleRowsJS, '; return false;')"/>
+          </xsl:attribute>
+          Hide <xsl:value-of select="@MessageCount" /> additional messages
+        </a>
+      </td>
+    </tr>
+  </xsl:template>
+
+  <!-- Message row templates -->
+  <xsl:template match="Message">
+    <tr>
+      <xsl:attribute name="name">
+        <xsl:value-of select="concat(@Status, 'RowClass', ../../@ProjectSafeName)"/>
+      </xsl:attribute>
+
+      <xsl:if test="@Level = 0">
+        <xsl:attribute name="style">display: none</xsl:attribute>
+      </xsl:if>
+      <td>
+        <a>
+          <xsl:attribute name="name">
+            <xsl:value-of select="concat(../../@ProjectSafeName, @Status)"/>
+          </xsl:attribute>
+        </a>
+        <img width="16" height="16">
+          <xsl:attribute name="src">
+            <xsl:choose>
+              <xsl:when test="@Status = 'Error'">_UpgradeReport_Files\UpgradeReport_Error.png</xsl:when>
+              <xsl:when test="@Status = 'Warning'">_UpgradeReport_Files\UpgradeReport_Warning.png</xsl:when>
+              <xsl:when test="@Status = 'Message'">_UpgradeReport_Files\UpgradeReport_Information.png</xsl:when>
+            </xsl:choose>
+          </xsl:attribute>
+          <xsl:attribute name="alt">
+            <xsl:value-of select="@Status" />
+          </xsl:attribute>
+        </img>
+      </td>
+      <td class="messageCell">
+        <strong>
+          <xsl:value-of select="@Source"/>:
+        </strong>
+        <span>
+          <xsl:value-of select="@Message"/>
+        </span>
+      </td>
+    </tr>
+  </xsl:template>
+
+  <!-- Project Details Template -->
+  <xsl:template match="Projects" mode="ProjectDetails">
+
+    <xsl:for-each select="Project">
+      <xsl:sort select="@ErrorCount" order="descending" />
+      <xsl:sort select="@WarningCount" order="descending" />
+      <!-- Always make solution last within a group -->
+      <xsl:sort select="@IsSolution" order="ascending" />
+      <xsl:sort select="@ProjectSafeName" order="ascending" />
+
+      <a>
+        <xsl:attribute name="name">
+          <xsl:value-of select="@ProjectSafeName"/>
+        </xsl:attribute>
+      </a>
+      <h3>
+        <xsl:value-of select="@ProjectDisplayName"/>
+      </h3>
+
+      <table>
+        <tr>
+          <xsl:attribute name="id">
+            <xsl:value-of select="concat(@ProjectSafeName, 'HeaderRow')"/>
+          </xsl:attribute>
+          <th></th>
+          <th class="messageCell" _locID="MessageTableHeader">Message</th>
+        </tr>
+
+        <!-- Errors and warnings -->
+        <xsl:for-each select="Messages/Message[@Level &gt; 0]">
+          <xsl:sort select="@Level" order="descending" />
+          <xsl:apply-templates select="." />
+        </xsl:for-each>
+
+        <xsl:if test="@MessageCount > 0">
+          <xsl:apply-templates select="." mode="ProjectShowMessages" />
+        </xsl:if>
+
+        <!-- Messages -->
+        <xsl:for-each select="Messages/Message[@Level = 0]">
+          <xsl:apply-templates select="." />
+        </xsl:for-each>
+
+        <xsl:choose>
+          <!-- Additional row as a 'place holder' for 'Show/Hide' additional messages -->
+          <xsl:when test="@MessageCount > 0">
+            <xsl:apply-templates select="." mode="ProjectHideMessages" />
+          </xsl:when>
+          <!-- No messages at all, show blank row -->
+          <xsl:when test="@TotalCount = 0">
+            <tr>
+              <td>
+                <img width="16" height="16" src="_UpgradeReport_Files\UpgradeReport_Information.png" />
+              </td>
+              <td class="messageCell" _locID="NoMessagesRow">
+                <xsl:value-of select="@ProjectDisplayName" /> logged no messages.
+              </td>
+            </tr>
+          </xsl:when>
+        </xsl:choose>
+      </table>
+    </xsl:for-each>
+  </xsl:template>
+
+  <!-- Document, matches "UpgradeReport" -->
+  <xsl:template match="UpgradeReport">
+    <!-- Output doc type the 'Mark of the web' which disabled prompting to run JavaScript from local HTML Files in IE --> 
+    <!-- NOTE: The whitespace around the 'Mark of the web' is important it must be exact --> 
+    <xsl:text disable-output-escaping="yes"><![CDATA[<!DOCTYPE html>
+<!-- saved from url=(0014)about:internet -->
+]]>
+    </xsl:text>
+    <html>
+      <head>
+        <meta content="en-us" http-equiv="Content-Language" />
+        <meta content="text/html; charset=utf-16" http-equiv="Content-Type" />
+        <link type="text/css" rel="stylesheet" href="_UpgradeReport_Files\UpgradeReport.css" />
+        <title _locID="ConversionReport0">
+          Migration Report
+        </title>
+
+        <script type="text/javascript" language="javascript">
+        <xsl:text disable-output-escaping="yes">
+          <![CDATA[
+          
+            // Startup 
+            // Hook up the the loaded event for the document/window, to linkify the document content
+            var startupFunction = function() { linkifyElement("messages"); };
+            
+            if(window.attachEvent)
+            {
+              window.attachEvent('onload', startupFunction);
+            }
+            else if (window.addEventListener) 
+            {
+              window.addEventListener('load', startupFunction, false);
+            }
+            else 
+            {
+              document.addEventListener('load', startupFunction, false);
+            } 
+            
+            // Toggles the visibility of table rows with the specified name 
+            function toggleTableRowsByName(name)
+            {
+               var allRows = document.getElementsByTagName('tr');
+               for (i=0; i < allRows.length; i++)
+               {
+                  var currentName = allRows[i].getAttribute('name');
+                  if(!!currentName && currentName.indexOf(name) == 0)
+                  {
+                      var isVisible = allRows[i].style.display == ''; 
+                      isVisible ? allRows[i].style.display = 'none' : allRows[i].style.display = '';
+                  }
+               }
+            }
+            
+            function scrollToFirstVisibleRow(name) 
+            {
+               var allRows = document.getElementsByTagName('tr');
+               for (i=0; i < allRows.length; i++)
+               {
+                  var currentName = allRows[i].getAttribute('name');
+                  var isVisible = allRows[i].style.display == ''; 
+                  if(!!currentName && currentName.indexOf(name) == 0 && isVisible)
+                  {
+                     allRows[i].scrollIntoView(true); 
+                     return true; 
+                  }
+               }
+               
+               return false;
+            }
+            
+            // Linkifies the specified text content, replaces candidate links with html links 
+            function linkify(text)
+            {
+                 if(!text || 0 === text.length)
+                 {
+                     return text; 
+                 }
+
+                 // Find {DriveLetter}:\Something or \\{uncshare}\something strings and replace them with file:/// links
+                 // It expects that a path ends in .extension, and that that extension does not have a space within it,
+                 // it does this as not to greedily match in the case of "Text C:\foo\file.txt some other text" 
+                 var filePath = /([A-z]\:|\\{2}[A-z].+)\\([^<]+)\.([^<\s]+)/gi;
+                 
+                 // Find http, https and ftp links and replace them with hyper links 
+                 var urlLink = /(http|https|ftp)\:\/\/[a-zA-Z0-9\-\.]+(:[a-zA-Z0-9]*)?\/?([a-zA-Z0-9\-\._\?\,\/\\\+&%\$#\=~;\{\}])*/gi;
+                 
+                 return text.replace(filePath, '<a class="localLink" href="file:///$&">$&</a>')
+                            .replace(urlLink, '<a href="$&">$&</a>') ;
+            }
+            
+            // Linkifies the specified element by ID
+            function linkifyElement(id)
+            {
+                var element = document.getElementById(id);
+                if(!!element)
+                {
+                  element.innerHTML = linkify(element.innerHTML); 
+                }
+            }
+            
+            function ToggleMessageVisibility(projectName)
+            {
+              if(!projectName || 0 === projectName.length)
+              {
+                return; 
+              }
+              
+              toggleTableRowsByName("MessageRowClass" + projectName);
+              toggleTableRowsByName('MessageRowHeaderShow' + projectName);
+              toggleTableRowsByName('MessageRowHeaderHide' + projectName); 
+            }
+            
+            function ScrollToFirstVisibleMessage(projectName)
+            {
+              if(!projectName || 0 === projectName.length)
+              {
+                return; 
+              }
+              
+              // First try the 'Show messages' row
+              if(!scrollToFirstVisibleRow('MessageRowHeaderShow' + projectName))
+              {
+                // Failed to find a visible row for 'Show messages', try an actual message row 
+                scrollToFirstVisibleRow('MessageRowClass' + projectName); 
+              }
+            }
+          ]]>
+        </xsl:text>
+        </script>
+      </head>
+      <body>
+        <h1 _locID="ConversionReport">
+          Migration Report - <xsl:value-of select="Properties/Property[@Name='Solution']/@Value"/>
+        </h1>
+
+        <div id="content">
+          <h2 _locID="OverviewTitle">Overview</h2>
+          <xsl:variable name="projectOverview">
+            <xsl:apply-templates select="self::node()" mode="ProjectOverviewXML" />
+          </xsl:variable>
+
+          <div id="overview">
+            <xsl:apply-templates select="msxsl:node-set($projectOverview)/*" mode="ProjectOverview" />
+          </div>
+
+          <h2 _locID="SolutionAndProjectsTitle">Solution and projects</h2>
+
+          <div id="messages">
+            <xsl:apply-templates select="msxsl:node-set($projectOverview)/*" mode="ProjectDetails" />
+          </div>
+        </div>
+      </body>
+    </html>
+  </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/_UpgradeReport_Files/UpgradeReport_Error.png b/_UpgradeReport_Files/UpgradeReport_Error.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ecbdf3c953d3b42344f23ca2642ac52ec75bcee
GIT binary patch
literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijiOI#yLg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<@_jGX#vGCtI
z`84k#1D-Zx7G?t{_XI|@2IqAicV_l-%PIyJXijaic+%GN|HL|(<?LRrD&D>F@j2Ja
z&dr%JN&ThgCczhbzRrJ_a%WP@^|!Oy58K^0Unle;p_#u%TY&xe@s~GPqApZeG7D*Q
ztS~rGd85>I7SEJ<iVIU3cTJeZvVXpzvkA-nu=7tV7^+rA${5Qwo_TpH`HJunrU3Kq
zcwr6)sTJPNIm{Q9PVt!9`}TA_!?tJnUJ-YXl<uFHu6RO3Pfmp`fq#+D;<wxOo$uS!
i^k<t-)#hpIKC>Ii*DUmtxKa%CB7>)^pUXO@geCxM%7T9Y

literal 0
HcmV?d00001

diff --git a/_UpgradeReport_Files/UpgradeReport_Information.png b/_UpgradeReport_Files/UpgradeReport_Information.png
new file mode 100644
index 0000000000000000000000000000000000000000..adefdc716e59dc47f47e27c7867807046c72a129
GIT binary patch
literal 306
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijiOI#yLg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=8_jGX#vG7k$
zaA3Z_uhyI4(O-u@^1RJQgf3h?{L{gcRl#om|A)u_f2@xCGd=DH2W#^Yhav@2g{>NF
zj;8z1+y3BkR^H`!^>|z}Pi21+$BB>$EV~~44`?_%;d4TG!yncnsa;9}^3xd=ELW5Z
zIk3Gs{w#gMq6u^L4@%5_s9>wGSAn_Um-KvYhqk6Ke8S8HY)bnK9Qa&LEfSn1b}rew
z)kRfh1>=I64|362Dq5P#l1_1HPUj+*q@^?Hl`dhuk$>wE&<hNnu6{1-oD!M<V<B%p

literal 0
HcmV?d00001

diff --git a/_UpgradeReport_Files/UpgradeReport_Success.png b/_UpgradeReport_Files/UpgradeReport_Success.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8c27bcf094ea0860ac5c7a1eeced541efd533df
GIT binary patch
literal 381
zcmV-@0fPRCP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000ie
z000ie0hKEb8vp<SFG)l}RCr#cld(#}P#A?zf~%0hrBK1ef9Pbe50EuOhm0<bQ{Ey&
z-=cIfeSr)avZi~)P8H%(P^g1L!55GNzn72;H;8Aw_nhzlFXws~sO!2%04acIaMS=O
zMC1uQc|GF|fbwuY+|}<j+OHOU&9CN&uVc)D*&aY5B1a7{=9lf;HmE;pxD-!gEN_=*
z03kzs1(c&^6#?tlbwCe|K6mEWF7rYbXtNg8Lj`L0xdT1)a)OjQyOiB$pf=AN15i)O
zfQS#~qE9X-IDMZ`b(I0ACt|=K=(a8}5cec;)vQ1b=$5PrNK*0`-2^l&iHal=Np{lJ
z(=ec5!|W;Gq^qa+Z6aG}cfsApy@-Uq8WPr%2S(#nPRt|f#|W94hq>-&@60ojc~?F7
b_jmpQHYJ(sAt^vU00000NkvXXu0mjf`*5Fz

literal 0
HcmV?d00001

diff --git a/_UpgradeReport_Files/UpgradeReport_Warning.png b/_UpgradeReport_Files/UpgradeReport_Warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..7197e0304d299e27ec06052057d4518076248914
GIT binary patch
literal 292
zcmV+<0o(qGP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000ie
z000ie0hKEb8vp<R)=5M`RCr#Ul06E-Fc^m4d{D$i#KpBsdjc=u6+A&bfOK_h-MV{#
zdIIqX9-ymBIt#iuh#(>uo03i;pQ#VLkU+xo=10JRlrjNOn&~ErqFe}jIl)a9KIYJA
zNWo*<FQ-DO3T^aQN|`IAyc=Yb*A^XSoc?3~*@8H`nCY-BcsroOw;+ez!fL_U?FQ}^
z#Mr%Bh|WHG@5||P4Ii$<0{39i{!U`-<`wuBWb9$^Il~vdw%IeT>pCay?5fh??}7jv
qZ-W*3V)h)mODq8-=*KRO<K-6#m9|nPY28Tx0000<MNUMnLSTXzTYA|5

literal 0
HcmV?d00001