Added net 45 to local storage. Added additional packages to tests to …

…be able to run in VS.
2020IP · May 23, 2016 · 40f86ac · 40f86ac
1 parent 1516694
commit 40f86ac
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 42 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v3/index.json" />
+    <add key="XUnit-MyGet" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/src/TwentyTwenty.Storage.Amazon/TwentyTwenty.Storage.Amazon.xproj b/src/TwentyTwenty.Storage.Amazon/TwentyTwenty.Storage.Amazon.xproj
@@ -4,17 +4,15 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>f3edb2b3-b0b1-4b48-9450-dd94e2270d09</ProjectGuid>
     <RootNamespace>TwentyTwenty.Storage.Amazon</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/src/TwentyTwenty.Storage.Amazon/project.json b/src/TwentyTwenty.Storage.Amazon/project.json
@@ -16,6 +16,7 @@
   "tooling": {
     "defaultNamespace": "TwentyTwenty.Storage.Amazon"
   },
+
   "frameworks": {
     "netstandard1.1": {
       "imports": [ "dnxcore50", "portable-net45+win8+wp8" ]
@@ -25,11 +26,9 @@
         "System.Runtime": "4.0.0",
         "System.Threading.Tasks": "4.0.0"
       }
-     },
-  },
-  "buildOptions": {
-    "define": [ "DNX" ]
+     }
   },
+
   "dependencies": {
     "TwentyTwenty.Storage": "1.0.2-*",
     "AWSSDK.S3": "3.1.3.5"

diff --git a/src/TwentyTwenty.Storage.Azure/TwentyTwenty.Storage.Azure.xproj b/src/TwentyTwenty.Storage.Azure/TwentyTwenty.Storage.Azure.xproj
@@ -9,7 +9,7 @@
     <ProjectGuid>6b86c0ac-918f-4399-bece-f80020dc86e6</ProjectGuid>
     <RootNamespace>TwentyTwenty.Storage.Azure</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
@@ -18,8 +18,5 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
   </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\TwentyTwenty.Storage\TwentyTwenty.Storage.csproj" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
diff --git a/src/TwentyTwenty.Storage.Azure/project.json b/src/TwentyTwenty.Storage.Azure/project.json
@@ -23,16 +23,14 @@
         "System.Runtime": "4.0.0",
         "System.Threading.Tasks": "4.0.0"
       }
-     },
+    },
     "netstandard1.1": {
       "imports": [ "dnxcore50", "portable-net45+win8" ]
     }
   },
+
   "dependencies": {
-    "TwentyTwenty.Storage": "*",
+    "TwentyTwenty.Storage": "1.0.2-*",
     "WindowsAzure.Storage": "6.2.2-preview"
-  },
-  "buildOptions": {
-      "define": [ "DNX" ]
   }
 }
diff --git a/src/TwentyTwenty.Storage.Google/TwentyTwenty.Storage.Google.xproj b/src/TwentyTwenty.Storage.Google/TwentyTwenty.Storage.Google.xproj
@@ -4,17 +4,15 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>1931f007-25df-4dee-86f6-c6ebef192c0b</ProjectGuid>
     <RootNamespace>TwentyTwenty.Storage.Google</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/src/TwentyTwenty.Storage.Local/TwentyTwenty.Storage.Local.xproj b/src/TwentyTwenty.Storage.Local/TwentyTwenty.Storage.Local.xproj
@@ -9,13 +9,10 @@
     <ProjectGuid>6ecd92c6-7bff-431d-ae3f-c52dfa370ec0</ProjectGuid>
     <RootNamespace>TwentyTwenty.Storage.Local</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\TwentyTwenty.Storage\TwentyTwenty.Storage.csproj" />
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
diff --git a/src/TwentyTwenty.Storage.Local/project.json b/src/TwentyTwenty.Storage.Local/project.json
@@ -16,19 +16,17 @@
   "tooling": {
     "defaultNamespace": "TwentyTwenty.Storage.Local"
   },
-
   "frameworks": {
     "netstandard1.3": {
       "dependencies": {
         "System.IO.FileSystem": "4.0.1-*",
         "System.Runtime.Extensions": "4.1.0-*"
       }
-    }
+    },
+    "net45": { }
   },
+
   "dependencies": {
     "TwentyTwenty.Storage": "1.0.2-*"
-  },
-  "buildOptions": {
-      "define": [ "DNX" ]
   }
 }
diff --git a/src/TwentyTwenty.Storage/project.json b/src/TwentyTwenty.Storage/project.json
@@ -27,8 +27,5 @@
     },
     "net45": {
     }
-  },
-  "buildOptions": {
-      "define": [ "DNX" ]
   }
 }
diff --git a/test/TwentyTwenty.Storage.Amazon.Test/TwentyTwenty.Storage.Amazon.Test.xproj b/test/TwentyTwenty.Storage.Amazon.Test/TwentyTwenty.Storage.Amazon.Test.xproj
@@ -9,7 +9,7 @@
     <ProjectGuid>b24fefad-0fee-4466-a7b7-96f6475a3f20</ProjectGuid>
     <RootNamespace>TwentyTwenty.Storage.Amazon.Tests</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

diff --git a/test/TwentyTwenty.Storage.Amazon.Test/project.json b/test/TwentyTwenty.Storage.Amazon.Test/project.json
@@ -7,9 +7,10 @@
     "defaultNamespace": "TwentyTwenty.Storage.Amazon.Test"
   },
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
     "TwentyTwenty.Storage.Amazon": "*",
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "1.0.0-rc3-build10019",
     "Microsoft.Extensions.Configuration": "1.0.0-rc2-final",
     "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc2-final",
     "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",

diff --git a/test/TwentyTwenty.Storage.Azure.Test/TwentyTwenty.Storage.Azure.Test.xproj b/test/TwentyTwenty.Storage.Azure.Test/TwentyTwenty.Storage.Azure.Test.xproj
@@ -9,7 +9,7 @@
     <ProjectGuid>8bf141aa-5bf0-41f7-8394-05d8dd8bf91f</ProjectGuid>
     <RootNamespace>TwentyTwenty.Storage.Azure.Test</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

diff --git a/test/TwentyTwenty.Storage.Azure.Test/project.json b/test/TwentyTwenty.Storage.Azure.Test/project.json
@@ -8,7 +8,8 @@
   },
 
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-*",
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
+    "dotnet-test-xunit": "1.0.0-rc3-build10019",
     "xunit": "2.1.0",
     "Microsoft.Extensions.Configuration": "1.0.0-rc2-final",
     "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc2-final",

diff --git a/test/TwentyTwenty.Storage.Google.Test/TwentyTwenty.Storage.Google.Test.xproj b/test/TwentyTwenty.Storage.Google.Test/TwentyTwenty.Storage.Google.Test.xproj
@@ -9,7 +9,7 @@
     <ProjectGuid>2f3afb47-27fe-47b4-bf4b-c370f1e51320</ProjectGuid>
     <RootNamespace>TwentyTwenty.Storage.Google.Test</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

diff --git a/test/TwentyTwenty.Storage.Google.Test/project.json b/test/TwentyTwenty.Storage.Google.Test/project.json
@@ -7,8 +7,9 @@
     "defaultNamespace": "TwentyTwenty.Storage.Google.Test"
   },
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
     "TwentyTwenty.Storage.Google": "*",
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "1.0.0-rc3-build10019",
     "xunit": "2.1.0",
     "Microsoft.Extensions.Configuration": "1.0.0-rc2-final",
     "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc2-final",

diff --git a/test/TwentyTwenty.Storage.Local.Test/TwentyTwenty.Storage.Local.Test.xproj b/test/TwentyTwenty.Storage.Local.Test/TwentyTwenty.Storage.Local.Test.xproj
@@ -9,7 +9,7 @@
     <ProjectGuid>c4a5dca4-d7d5-4165-929e-7db701158fab</ProjectGuid>
     <RootNamespace>TwentyTwenty.Storage.Local.Test</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

diff --git a/test/TwentyTwenty.Storage.Local.Test/project.json b/test/TwentyTwenty.Storage.Local.Test/project.json
@@ -10,9 +10,10 @@
   },
   "testRunner": "xunit",
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
     "TwentyTwenty.Storage": "*",
     "TwentyTwenty.Storage.Local": "*",
-    "dotnet-test-xunit": "1.0.0-*",
+    "dotnet-test-xunit": "1.0.0-rc3-build10019",
     "xunit": "2.1.0"
   }
 }