.net core 1.0

shayhatsor · Jul 9, 2016 · abe3295 · abe3295
1 parent 4111d80
commit abe3295
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 27 deletions.
diff --git a/readme.md b/readme.md
@@ -13,8 +13,8 @@ Apache ZooKeeper .NET async Client
 ####Build From Source
 #####Prerequisites
 1. [Apache Ant](http://ant.apache.org/manual/install.html).
-2. [Visual Studio 2015](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx) with [Update 2](http://go.microsoft.com/fwlink/?LinkId=691129).
-3. [Microsoft .NET Core 1.0.0 RC2 - VS 2015 Tooling Preview 1](https://go.microsoft.com/fwlink/?LinkId=798481).
+2. [Visual Studio 2015](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx) with [Update 3](http://go.microsoft.com/fwlink/?LinkId=691129).
+3. [Microsoft .NET Core 1.0.0 - VS 2015 Tooling Preview 2](https://go.microsoft.com/fwlink/?LinkId=817245).
 
 #####Build Steps
 1. Run `ant` on the repository's root folder.

diff --git a/src/csharp/NuGet.config b/src/csharp/NuGet.config
@@ -2,7 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetcirelease/api/v3/index.json" />
+    <add key="AspNetVNext" value="https://www.myget.org/f/aspnetmaster/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/src/csharp/ZooKeeperNetEx.sln b/src/csharp/ZooKeeperNetEx.sln
@@ -1,14 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3124BC6C-39C6-473D-B3E5-E04C85D922F4}"
 	ProjectSection(SolutionItems) = preProject
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		global.json = global.json
-		makefile.shade = makefile.shade
 		NuGet.config = NuGet.config
 		NuGetPackageVerifier.json = NuGetPackageVerifier.json
 		pack.cmd = pack.cmd

diff --git a/src/csharp/build.ps1 b/src/csharp/build.ps1
@@ -33,7 +33,7 @@ cd $PSScriptRoot
 $repoFolder = $PSScriptRoot
 $env:REPO_FOLDER = $repoFolder
 
-$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/release.zip"
+$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip"
 if ($env:KOREBUILD_ZIP)
 {
     $koreBuildZip=$env:KOREBUILD_ZIP

diff --git a/src/csharp/build.sh b/src/csharp/build.sh
@@ -2,7 +2,7 @@
 repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $repoFolder
 
-koreBuildZip="https://github.com/aspnet/KoreBuild/archive/release.zip"
+koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip"
 if [ ! -z $KOREBUILD_ZIP ]; then
     koreBuildZip=$KOREBUILD_ZIP
 fi

diff --git a/src/csharp/pack.cmd b/src/csharp/pack.cmd
@@ -1,4 +1,4 @@
-call build
+call build verify
 set KOREBUILD_VERIFY_NUPKGS=1
 set Configuration=Release
-call build
+call build verify
diff --git a/src/csharp/src/ZooKeeperNetEx.Recipes/project.json b/src/csharp/src/ZooKeeperNetEx.Recipes/project.json
@@ -1,12 +1,12 @@
 {
   "title": "Apache ZooKeeper .NET async Recipes",
-  "version": "3.4.8.4",
+  "version": "3.4.8.5",
   "description": ".NET async Distributed recipes for ZooKeeper: Queue, Lock and Leader Election.",
   "authors": [ "Shay Hazor" ],
   "packOptions": {
     "owners": [ "Shay Hazor" ],
     "summary": ".NET async Recipes for ZooKeeper",
-    "releaseNotes": ".NET Core RC2\nThis project is actively maintained at: https://github.com/shayhatsor/zookeeper \nPlease feel free to open an issue or ask a question there.",
+    "releaseNotes": ".NET Core 1.0 RTM\nThis project is actively maintained at: https://github.com/shayhatsor/zookeeper \nPlease feel free to open an issue or ask a question there.",
     "tags": [ "ZooKeeper", "Recipes", ".NET", "Lock", "Leader Election", "Queue" ],
     "projectUrl": "https://github.com/shayhatsor/zookeeper",
     "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
@@ -33,6 +33,6 @@
     }
   },
   "dependencies": {
-    "ZooKeeperNetEx": "3.4.8.4"
+    "ZooKeeperNetEx": "3.4.8.5"
   }
 }
diff --git a/src/csharp/src/ZooKeeperNetEx/project.json b/src/csharp/src/ZooKeeperNetEx/project.json
@@ -1,12 +1,12 @@
 {
   "title": "Apache ZooKeeper .NET async Client",
-  "version": "3.4.8.4",
+  "version": "3.4.8.5",
   "description": "A .NET async Client fully compliant with ZooKeeper, supporting all features. Fully Task-based Asynchronous (async/await). A great measure has been taken to follow the logic of the official Java client, including all relevant unit tests. In fact, the code is almost identical. Thus allowing easy evolution alongside the Java version.",
   "authors": [ "Shay Hazor" ],
   "packOptions": {
     "owners": [ "Shay Hazor" ],
     "summary": "A .NET async Client for ZooKeeper",
-    "releaseNotes": ".NET Core RC2\nThis project is actively maintained at: https://github.com/shayhatsor/zookeeper \nPlease feel free to open an issue or ask a question there.\n\nKnown limitations:\nNo SASL support",
+    "releaseNotes": ".NET Core 1.0 RTM\nThis project is actively maintained at: https://github.com/shayhatsor/zookeeper \nPlease feel free to open an issue or ask a question there.\n\nKnown limitations:\nNo SASL support",
     "tags": [ "ZooKeeper", ".NET", "Client", "Async"],
     "projectUrl": "https://github.com/shayhatsor/zookeeper",
     "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
@@ -36,10 +36,10 @@
   "frameworks": {
     "netstandard13": {
       "dependencies": {
-        "NETStandard.Library": "1.5.0-*",
-        "System.Diagnostics.TraceSource": "4.0.0-*",
-        "System.Net.NameResolution": "4.0.0-*",
-        "System.Net.Sockets": "4.1.0-*"
+        "NETStandard.Library": "1.5.0-rc2-24027",
+        "System.Diagnostics.TraceSource": "4.0.0",
+        "System.Net.NameResolution": "4.0.0",
+        "System.Net.Sockets": "4.1.0"
       }
     },
     "net45": { },

diff --git a/src/csharp/test/ZooKeeperNetEx.Recipes.Tests/project.json b/src/csharp/test/ZooKeeperNetEx.Recipes.Tests/project.json
@@ -5,8 +5,8 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "ZooKeeperNetEx.Tests": "1.0.0.0",
-    "ZooKeeperNetEx.Recipes": "3.4.8.4"
+    "ZooKeeperNetEx.Tests": "*",
+    "ZooKeeperNetEx.Recipes": "3.4.8.5"
   },
   "frameworks": {
     "netcoreapp1.0": {

diff --git a/src/csharp/test/ZooKeeperNetEx.Tests/project.json b/src/csharp/test/ZooKeeperNetEx.Tests/project.json
@@ -5,19 +5,19 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "ZooKeeperNetEx": "3.4.8.4",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
+    "ZooKeeperNetEx": "3.4.8.5",
     "Newtonsoft.Json": "*",
-    "xunit": "2.1.0"
+    "xunit": "2.1.0",
+    "dotnet-test-xunit": "1.0.0-*"
   },
   "frameworks": {
      "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
-        },
-        "dotnet-test-xunit": "1.0.0-*"
+        }
       },
       "imports": [
         "dnxcore50",
@@ -28,9 +28,6 @@
       "frameworkAssemblies": {
         "System.Runtime": "",
         "System.Threading.Tasks": ""
-      },
-      "dependencies": {
-        "xunit.runner.console": "2.1.0"
       }
     }
   },