References changed

merkle-open · Jun 10, 2016 · 390325b · 390325b
1 parent 197a3bd
commit 390325b
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 137 deletions.
diff --git a/NitroNet.Sitecore.CastleWindsorModules/NitroNet.Sitecore.CastleWindsorModules.csproj b/NitroNet.Sitecore.CastleWindsorModules/NitroNet.Sitecore.CastleWindsorModules.csproj
@@ -29,15 +29,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Develop|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Develop\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>
@@ -47,30 +38,6 @@
       <HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NitroNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\NitroNet.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.CastleWindsorModules, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.CastleWindsorModules.1.0.0.0\lib\net452\NitroNet.CastleWindsorModules.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\NitroNet.Common.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.Mvc, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\NitroNet.Mvc.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.ViewEngine, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\NitroNet.ViewEngine.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.ViewEngine.TemplateHandler, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\NitroNet.ViewEngine.TemplateHandler.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Sitecore.Mvc">
       <HintPath>..\Libs\Sitecore.Mvc.dll</HintPath>
     </Reference>
@@ -82,17 +49,31 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="Veil, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\Veil.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Veil.Handlebars, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\Veil.Handlebars.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <Choose>
-    <When Condition="'$(Configuration)' == 'Develop'">
+    <When Condition="'$(Configuration)' == 'Release'">
+      <ItemGroup>
+        <Reference Include="NitroNet.Common">
+          <HintPath>..\..\NitroNet\NitroNet.Common\bin\release\NitroNet.Common.dll</HintPath>
+        </Reference>
+        <Reference Include="NitroNet.Mvc">
+          <HintPath>..\..\NitroNet\NitroNet.Mvc\bin\release\NitroNet.Mvc.dll</HintPath>
+        </Reference>
+        <Reference Include="NitroNet.CastleWindsorModules">
+          <HintPath>..\..\NitroNet\NitroNet.CastleWindsorModules\bin\release\NitroNet.CastleWindsorModules.dll</HintPath>
+        </Reference>
+        <Reference Include="NitroNet.ViewEngine">
+          <HintPath>..\..\NitroNet\NitroNet.ViewEngine\bin\release\NitroNet.ViewEngine.dll</HintPath>
+        </Reference>
+        <Reference Include="NitroNet.ViewEngine.TemplateHandler">
+          <HintPath>..\..\NitroNet\NitroNet.ViewEngine.TemplateHandler\bin\release\NitroNet.ViewEngine.TemplateHandler.dll</HintPath>
+        </Reference>
+        <Reference Include="Veil">
+          <HintPath>..\..\NitroNet\Veil\Src\Veil\bin\release\Veil.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <When Condition="'$(Configuration)' == 'Debug'">
       <ItemGroup>
         <Reference Include="NitroNet.Common">
           <HintPath>..\..\NitroNet\NitroNet.Common\bin\debug\NitroNet.Common.dll</HintPath>

diff --git a/NitroNet.Sitecore.CastleWindsorModules/packages.config b/NitroNet.Sitecore.CastleWindsorModules/packages.config
@@ -12,7 +12,5 @@
   <package id="MSBuild.Extension.Pack" version="1.8.0" targetFramework="net45" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="Newtonsoft.Json.Schema" version="1.0.8" targetFramework="net45" />
-  <package id="NitroNet" version="1.0.0.0" targetFramework="net452" />
-  <package id="NitroNet.CastleWindsorModules" version="1.0.0.0" targetFramework="net452" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
 </packages>
diff --git a/NitroNet.Sitecore.UnityModules/NitroNet.Sitecore.UnityModules.csproj b/NitroNet.Sitecore.UnityModules/NitroNet.Sitecore.UnityModules.csproj
@@ -31,15 +31,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Develop|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Develop\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
@@ -73,30 +64,6 @@
       <HintPath>..\packages\Newtonsoft.Json.Schema.1.0.8\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NitroNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\NitroNet.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\NitroNet.Common.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.Mvc, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\NitroNet.Mvc.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.UnityModules, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.UnityModules.1.0.0.4\lib\net45\NitroNet.UnityModules.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.ViewEngine, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\NitroNet.ViewEngine.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.ViewEngine.TemplateHandler, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\NitroNet.ViewEngine.TemplateHandler.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Sitecore.Mvc">
       <HintPath>..\Libs\Sitecore.Mvc.dll</HintPath>
     </Reference>
@@ -140,17 +107,31 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="Veil, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\Veil.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Veil.Handlebars, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.1.0.0.0\lib\net45\Veil.Handlebars.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <Choose>
-    <When Condition="'$(Configuration)' == 'Develop'">
+    <When Condition="'$(Configuration)' == 'Release'">
+      <ItemGroup>
+        <Reference Include="NitroNet.Common">
+          <HintPath>..\..\NitroNet\NitroNet.Common\bin\release\NitroNet.Common.dll</HintPath>
+        </Reference>
+        <Reference Include="NitroNet.Mvc">
+          <HintPath>..\..\NitroNet\NitroNet.Mvc\bin\release\NitroNet.Mvc.dll</HintPath>
+        </Reference>
+        <Reference Include="NitroNet.UnityModules">
+          <HintPath>..\..\NitroNet\NitroNet.UnityModules\bin\release\NitroNet.UnityModules.dll</HintPath>
+        </Reference>
+        <Reference Include="NitroNet.ViewEngine">
+          <HintPath>..\..\NitroNet\NitroNet.ViewEngine\bin\release\NitroNet.ViewEngine.dll</HintPath>
+        </Reference>
+        <Reference Include="NitroNet.ViewEngine.TemplateHandler">
+          <HintPath>..\..\NitroNet\NitroNet.ViewEngine.TemplateHandler\bin\release\NitroNet.ViewEngine.TemplateHandler.dll</HintPath>
+        </Reference>
+        <Reference Include="Veil">
+          <HintPath>..\..\NitroNet\Veil\Src\Veil\bin\release\Veil.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <When Condition="'$(Configuration)' == 'Debug'">
       <ItemGroup>
         <Reference Include="NitroNet.Common">
           <HintPath>..\..\NitroNet\NitroNet.Common\bin\debug\NitroNet.Common.dll</HintPath>

diff --git a/NitroNet.Sitecore.UnityModules/packages.config b/NitroNet.Sitecore.UnityModules/packages.config
@@ -10,8 +10,6 @@
   <package id="MSBuild.Extension.Pack" version="1.8.0" targetFramework="net45" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="Newtonsoft.Json.Schema" version="1.0.8" targetFramework="net45" />
-  <package id="NitroNet" version="1.0.0.0" targetFramework="net45" />
-  <package id="NitroNet.UnityModules" version="1.0.0.4" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
   <package id="Unity" version="4.0.1" targetFramework="net45" />
 </packages>
diff --git a/NitroNet.Sitecore.sln b/NitroNet.Sitecore.sln
@@ -12,26 +12,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Develop|Any CPU = Develop|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D5228116-9EBD-4055-B50B-33A2F28B2A6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D5228116-9EBD-4055-B50B-33A2F28B2A6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5228116-9EBD-4055-B50B-33A2F28B2A6E}.Develop|Any CPU.ActiveCfg = Develop|Any CPU
-		{D5228116-9EBD-4055-B50B-33A2F28B2A6E}.Develop|Any CPU.Build.0 = Develop|Any CPU
 		{D5228116-9EBD-4055-B50B-33A2F28B2A6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5228116-9EBD-4055-B50B-33A2F28B2A6E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F836AB0E-1182-4D45-836F-0066DEDE0D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F836AB0E-1182-4D45-836F-0066DEDE0D68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F836AB0E-1182-4D45-836F-0066DEDE0D68}.Develop|Any CPU.ActiveCfg = Develop|Any CPU
-		{F836AB0E-1182-4D45-836F-0066DEDE0D68}.Develop|Any CPU.Build.0 = Develop|Any CPU
 		{F836AB0E-1182-4D45-836F-0066DEDE0D68}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F836AB0E-1182-4D45-836F-0066DEDE0D68}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7AB3D8F6-200A-4C56-8310-4FCBF862815B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7AB3D8F6-200A-4C56-8310-4FCBF862815B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AB3D8F6-200A-4C56-8310-4FCBF862815B}.Develop|Any CPU.ActiveCfg = Develop|Any CPU
-		{7AB3D8F6-200A-4C56-8310-4FCBF862815B}.Develop|Any CPU.Build.0 = Develop|Any CPU
 		{7AB3D8F6-200A-4C56-8310-4FCBF862815B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7AB3D8F6-200A-4C56-8310-4FCBF862815B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

diff --git a/NitroNet.Sitecore/NitroNet.Sitecore.csproj b/NitroNet.Sitecore/NitroNet.Sitecore.csproj
@@ -33,15 +33,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Develop|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Develop\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
@@ -63,26 +54,6 @@
       <HintPath>..\packages\Newtonsoft.Json.Schema.1.0.8\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NitroNet.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.Core.1.0.0.4\lib\net45\NitroNet.Common.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.Core.1.0.0.4\lib\net45\NitroNet.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.Mvc, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.Core.1.0.0.4\lib\net45\NitroNet.Mvc.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.ViewEngine, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.Core.1.0.0.4\lib\net45\NitroNet.ViewEngine.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NitroNet.ViewEngine.TemplateHandler, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.Core.1.0.0.4\lib\net45\NitroNet.ViewEngine.TemplateHandler.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Sitecore.Kernel">
       <HintPath>..\Libs\Sitecore.Kernel.dll</HintPath>
     </Reference>
@@ -130,14 +101,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="Veil, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.Core.1.0.0.4\lib\net45\Veil.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Veil.Handlebars, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NitroNet.Core.1.0.0.4\lib\net45\Veil.Handlebars.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Caching\ISitecoreCache.cs" />
@@ -164,17 +127,33 @@
     <Compile Include="Skin\NitroNetTemplateInfo.cs" />
   </ItemGroup>
   <Choose>
-    <When Condition="'$(Configuration)' == 'Develop'">
+    <When Condition="'$(Configuration)' == 'Release'">
+      <ItemGroup>
+        <Reference Include="NitroNet.Common">
+          <HintPath>..\..\NitroNet\NitroNet.Common\bin\release\NitroNet.Common.dll</HintPath>
+        </Reference>
+        <Reference Include="NitroNet.Mvc">
+          <HintPath>..\..\NitroNet\NitroNet.Mvc\bin\release\NitroNet.Mvc.dll</HintPath>
+        </Reference>
+        <Reference Include="NitroNet.ViewEngine">
+          <HintPath>..\..\NitroNet\NitroNet.ViewEngine\bin\release\NitroNet.ViewEngine.dll</HintPath>
+        </Reference>
+        <Reference Include="NitroNet.ViewEngine.TemplateHandler">
+          <HintPath>..\..\NitroNet\NitroNet.ViewEngine.TemplateHandler\bin\release\NitroNet.ViewEngine.TemplateHandler.dll</HintPath>
+        </Reference>
+        <Reference Include="Veil">
+          <HintPath>..\..\NitroNet\Veil\Src\Veil\bin\release\Veil.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <When Condition="'$(Configuration)' == 'Debug'">
       <ItemGroup>
         <Reference Include="NitroNet.Common">
           <HintPath>..\..\NitroNet\NitroNet.Common\bin\debug\NitroNet.Common.dll</HintPath>
         </Reference>
         <Reference Include="NitroNet.Mvc">
           <HintPath>..\..\NitroNet\NitroNet.Mvc\bin\debug\NitroNet.Mvc.dll</HintPath>
         </Reference>
-        <Reference Include="NitroNet.UnityModules">
-          <HintPath>..\..\NitroNet\NitroNet.UnityModules\bin\debug\NitroNet.UnityModules.dll</HintPath>
-        </Reference>
         <Reference Include="NitroNet.ViewEngine">
           <HintPath>..\..\NitroNet\NitroNet.ViewEngine\bin\debug\NitroNet.ViewEngine.dll</HintPath>
         </Reference>

diff --git a/NitroNet.Sitecore/packages.config b/NitroNet.Sitecore/packages.config
@@ -10,6 +10,5 @@
   <package id="MSBuild.Extension.Pack" version="1.8.0" targetFramework="net45" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="Newtonsoft.Json.Schema" version="1.0.8" targetFramework="net45" />
-  <package id="NitroNet.Core" version="1.0.0.4" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
 </packages>