Adjust projects so they don§t require old nuGet restore way

jahav · Jul 16, 2014 · 42f97b9 · 42f97b9
1 parent d5759e9
commit 42f97b9
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 118 deletions.
diff --git a/Nerula.Data/Nerula.Data.csproj b/Nerula.Data/Nerula.Data.csproj
@@ -4,14 +4,13 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6DF822F0-A3A6-4E62-9047-9238EE27C172}</ProjectGuid>
+    <ProjectGuid>{5BB8B701-A6B4-4366-8D6B-B0915A128077}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Nerula.Data</RootNamespace>
     <AssemblyName>Nerula.Data</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Nerula.Data/Properties/AssemblyInfo.cs b/Nerula.Data/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("2b0625e1-1799-4751-817e-1dcdaad2e9b3")]
+[assembly: Guid("c27107ec-bccc-4c68-92d7-c7aa2d06c8b9")]
 
 // Version information for an assembly consists of the following four values:
 //

diff --git a/Nerula.Test/DatabaseTest.cs b/Nerula.Test/DatabaseTest.cs
@@ -62,6 +62,7 @@ private void DatabaseSetup(System.Action<Configuration> addMapping)
 				.SetProperty(Environment.ConnectionString, "data source=:memory:;version=3")
 				.SetProperty(Environment.CollectionTypeFactoryClass, typeof(Net4CollectionTypeFactory).AssemblyQualifiedName)
                 .SetProperty(Environment.UseSecondLevelCache, "true")
+                .SetProperty(Environment.CacheDefaultExpiration, "10") // Default 2nd lvl cache expiration, in seconds
                 .SetProperty(Environment.CacheProvider, typeof(SysCacheProvider).AssemblyQualifiedName);
 
 			addMapping(configuration);

diff --git a/Nerula.Test/Nerula.Test.csproj b/Nerula.Test/Nerula.Test.csproj
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E92BC6CE-A13C-4439-91AD-78784DBF6249}</ProjectGuid>
+    <ProjectGuid>{4415A8C7-B6A2-4938-B008-D614520BA66B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Nerula.Test</RootNamespace>
     <AssemblyName>Nerula.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
-    <TargetFrameworkProfile />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -28,7 +25,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -37,37 +33,21 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper">
-      <HintPath>..\packages\AutoMapper.3.2.1\lib\net40\AutoMapper.dll</HintPath>
-    </Reference>
-    <Reference Include="AutoMapper.Net4">
-      <HintPath>..\packages\AutoMapper.3.2.1\lib\net40\AutoMapper.Net4.dll</HintPath>
-    </Reference>
     <Reference Include="Iesi.Collections">
       <HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin">
-      <HintPath>..\packages\Microsoft.Owin.2.0.0\lib\net45\Microsoft.Owin.dll</HintPath>
-    </Reference>
     <Reference Include="NHibernate">
       <HintPath>..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll</HintPath>
     </Reference>
     <Reference Include="NHibernate.Caches.SysCache">
       <HintPath>..\packages\NHibernate.Caches.SysCache.3.3.3.4000\lib\net35\NHibernate.Caches.SysCache.dll</HintPath>
     </Reference>
-    <Reference Include="Owin">
-      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Data.SQLite">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.92.0\lib\net451\System.Data.SQLite.dll</HintPath>
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.93.0\lib\net45\System.Data.SQLite.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Choose>
@@ -84,26 +64,29 @@
   </Choose>
   <ItemGroup>
     <Compile Include="Cache2ndLevel.cs" />
+    <Compile Include="CacheEvict.cs" />
     <Compile Include="ComponentSortTest.cs" />
     <Compile Include="DatabaseTest.cs" />
+    <Compile Include="InvoiceManyToManyTest.cs" />
     <Compile Include="InvoiceTest.cs" />
     <Compile Include="Net4Collections.cs" />
     <Compile Include="NHibernateEqualsTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SQLiteInMemoryConnectionProvider.cs" />
     <Compile Include="SqlQueryInterceptor.cs" />
-    <Compile Include="InvoiceManyToManyTest.cs" />
-    <Compile Include="CacheEvict.cs" />
     <Compile Include="SqlQuerySynchronizeTest.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
+    <ProjectReference Include="..\Nerula.Data\Nerula.Data.csproj">
+      <Project>{5bb8b701-a6b4-4366-8d6b-b0915a128077}</Project>
+      <Name>Nerula.Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Nerula.Wip\Nerula.Wip.csproj">
+      <Project>{54632850-0099-492b-b3c7-43d7d49329fd}</Project>
+      <Name>Nerula.Wip</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="changelog.xml">
-      <SubType>Designer</SubType>
-    </Content>
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -112,14 +95,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Nerula.Data\Nerula.Data.csproj">
-      <Project>{6df822f0-a3a6-4e62-9047-9238ee27c172}</Project>
-      <Name>Nerula.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Nerula.Wip\Nerula.Wip.csproj">
-      <Project>{42267415-4c8d-4724-b076-0f062b892da8}</Project>
-      <Name>Nerula.Wip</Name>
-    </ProjectReference>
+    <None Include="packages.config" />
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
@@ -141,14 +117,6 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets" Condition="Exists('..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets')" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>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}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- 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/Nerula.Test/Properties/AssemblyInfo.cs b/Nerula.Test/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("37119580-fe0d-4565-b1a9-be547aff3063")]
+[assembly: Guid("969bddb7-7ed7-4d0e-83f3-ec1de271ddbb")]
 
 // Version information for an assembly consists of the following four values:
 //

diff --git a/Nerula.Test/app.config b/Nerula.Test/app.config
diff --git a/Nerula.Test/changelog.xml b/Nerula.Test/changelog.xml
diff --git a/Nerula.Test/packages.config b/Nerula.Test/packages.config
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="3.2.1" targetFramework="net451" />
-  <package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net451" />
-  <package id="Microsoft.Owin" version="2.0.0" targetFramework="net451" />
-  <package id="NHibernate" version="3.3.3.4001" targetFramework="net451" />
-  <package id="NHibernate.Caches.SysCache" version="3.3.3.4000" targetFramework="net451" />
-  <package id="NHibernate.SetForNet4" version="1.0.3" targetFramework="net451" />
-  <package id="Owin" version="1.0" targetFramework="net451" />
-  <package id="System.Data.SQLite.Core" version="1.0.92.0" targetFramework="net451" />
+  <package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net45" />
+  <package id="NHibernate" version="3.3.3.4001" targetFramework="net45" />
+  <package id="NHibernate.Caches.SysCache" version="3.3.3.4000" targetFramework="net45" />
+  <package id="NHibernate.SetForNet4" version="1.0.3" targetFramework="net45" />
+  <package id="System.Data.SQLite.Core" version="1.0.93.0" targetFramework="net45" />
 </packages>
diff --git a/Nerula.Test/x64/SQLite.Interop.dll b/Nerula.Test/x64/SQLite.Interop.dll
diff --git a/Nerula.Test/x86/SQLite.Interop.dll b/Nerula.Test/x86/SQLite.Interop.dll
diff --git a/Nerula.Wip/Nerula.Wip.csproj b/Nerula.Wip/Nerula.Wip.csproj
@@ -4,14 +4,13 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{42267415-4C8D-4724-B076-0F062B892DA8}</ProjectGuid>
+    <ProjectGuid>{54632850-0099-492B-B3C7-43D7D49329FD}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Nerula.Wip</RootNamespace>
     <AssemblyName>Nerula.Wip</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,13 +49,11 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Wip.hbm.xml" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="WipPriceComponent.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Nerula.Data\Nerula.Data.csproj">
-      <Project>{6df822f0-a3a6-4e62-9047-9238ee27c172}</Project>
+      <Project>{5bb8b701-a6b4-4366-8d6b-b0915a128077}</Project>
       <Name>Nerula.Data</Name>
     </ProjectReference>
   </ItemGroup>

diff --git a/Nerula.Wip/Properties/AssemblyInfo.cs b/Nerula.Wip/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("d85d0eff-c336-4953-9e2a-a4c2e0d82d20")]
+[assembly: Guid("b040b26b-c61f-4887-a635-42a47479a6b1")]
 
 // Version information for an assembly consists of the following four values:
 //

diff --git a/Nerula.sln b/Nerula.sln
@@ -3,30 +3,34 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Express 2013 for Web
 VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nerula.Test", "Nerula.Test\Nerula.Test.csproj", "{E92BC6CE-A13C-4439-91AD-78784DBF6249}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nerula.Test", "Nerula.Test\Nerula.Test.csproj", "{4415A8C7-B6A2-4938-B008-D614520BA66B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5BB8B701-A6B4-4366-8D6B-B0915A128077} = {5BB8B701-A6B4-4366-8D6B-B0915A128077}
+		{54632850-0099-492B-B3C7-43D7D49329FD} = {54632850-0099-492B-B3C7-43D7D49329FD}
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nerula.Wip", "Nerula.Wip\Nerula.Wip.csproj", "{42267415-4C8D-4724-B076-0F062B892DA8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nerula.Data", "Nerula.Data\Nerula.Data.csproj", "{5BB8B701-A6B4-4366-8D6B-B0915A128077}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nerula.Data", "Nerula.Data\Nerula.Data.csproj", "{6DF822F0-A3A6-4E62-9047-9238EE27C172}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nerula.Wip", "Nerula.Wip\Nerula.Wip.csproj", "{54632850-0099-492B-B3C7-43D7D49329FD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E92BC6CE-A13C-4439-91AD-78784DBF6249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E92BC6CE-A13C-4439-91AD-78784DBF6249}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E92BC6CE-A13C-4439-91AD-78784DBF6249}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E92BC6CE-A13C-4439-91AD-78784DBF6249}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42267415-4C8D-4724-B076-0F062B892DA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42267415-4C8D-4724-B076-0F062B892DA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42267415-4C8D-4724-B076-0F062B892DA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42267415-4C8D-4724-B076-0F062B892DA8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6DF822F0-A3A6-4E62-9047-9238EE27C172}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6DF822F0-A3A6-4E62-9047-9238EE27C172}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6DF822F0-A3A6-4E62-9047-9238EE27C172}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6DF822F0-A3A6-4E62-9047-9238EE27C172}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4415A8C7-B6A2-4938-B008-D614520BA66B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4415A8C7-B6A2-4938-B008-D614520BA66B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4415A8C7-B6A2-4938-B008-D614520BA66B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4415A8C7-B6A2-4938-B008-D614520BA66B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BB8B701-A6B4-4366-8D6B-B0915A128077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BB8B701-A6B4-4366-8D6B-B0915A128077}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BB8B701-A6B4-4366-8D6B-B0915A128077}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BB8B701-A6B4-4366-8D6B-B0915A128077}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54632850-0099-492B-B3C7-43D7D49329FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54632850-0099-492B-B3C7-43D7D49329FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54632850-0099-492B-B3C7-43D7D49329FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54632850-0099-492B-B3C7-43D7D49329FD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/packages/repositories.config b/packages/repositories.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <repositories>
-  <repository path="..\Nerula.Data\packages.config" />
   <repository path="..\Nerula.Test\packages.config" />
 </repositories>