.Net Core 1.0 RTM update

panchengtao · Jun 28, 2016 · be5f196 · be5f196
1 parent 7043052
commit be5f196
Show file tree

Hide file tree

Showing 10 changed files with 132 additions and 67 deletions.
diff --git a/Dapper.Contrib/project.json b/Dapper.Contrib/project.json
@@ -55,7 +55,7 @@
         "define": [ "ASYNC", "COREFX" ]
       },
       "dependencies": {
-        "Microsoft.CSharp": "4.0.1-rc2-24027"
+        "Microsoft.CSharp": "4.0.1"
       }
     }
   }

diff --git a/Dapper.Rainbow/project.json b/Dapper.Rainbow/project.json
@@ -55,7 +55,7 @@
         "define": [ "ASYNC", "COREFX" ]
       },
       "dependencies": {
-        "Microsoft.CSharp": "4.0.1-rc2-24027"
+        "Microsoft.CSharp": "4.0.1"
       }
     }
   }

diff --git a/Dapper.SqlBuilder/project.json b/Dapper.SqlBuilder/project.json
@@ -45,7 +45,7 @@
         "define": [ "ASYNC", "COREFX" ]
       },
       "dependencies": {
-        "Microsoft.CSharp": "4.0.1-rc2-24027"
+        "Microsoft.CSharp": "4.0.1"
       }
     }
   }

diff --git a/Dapper.StrongName/project.json b/Dapper.StrongName/project.json
@@ -64,14 +64,24 @@
         "define": [ "ASYNC", "COREFX" ]
       },
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027",
-        "System.Data.SqlClient": "4.1.0-rc2-24027",
-        "System.Dynamic.Runtime": "4.0.11-rc2-24027",
-        "System.Reflection.Emit": "4.0.1-rc2-24027",
-        "System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027",
-        "System.Xml.XmlDocument": "4.0.1-rc2-24027",
-        "System.Collections.NonGeneric": "4.0.1-rc2-24027",
-        "System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
+        "System.Collections": "4.0.11",
+        "System.Collections.Concurrent": "4.0.12",
+        "System.Collections.NonGeneric": "4.0.1",
+        "System.Data.SqlClient": "4.1.0",
+        "System.Dynamic.Runtime": "4.0.11",
+        "System.Linq": "4.1.0",
+        "System.Reflection": "4.1.0",
+        "System.Reflection.Emit": "4.0.1",
+        "System.Reflection.Emit.Lightweight": "4.0.1",
+        "System.Reflection.Extensions": "4.0.1",
+        "System.Reflection.TypeExtensions": "4.1.0",
+        "System.Runtime": "4.1.0",
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Runtime.InteropServices": "4.1.0",
+        "System.Text.RegularExpressions": "4.1.0",
+        "System.Threading": "4.0.11",
+        "System.Xml.XDocument": "4.0.11",
+        "System.Xml.XmlDocument": "4.0.1"
       }
     }
   }

diff --git a/Dapper.Tests.Contrib/project.json b/Dapper.Tests.Contrib/project.json
@@ -24,7 +24,9 @@
     },
     "Dapper.SqlBuilder": {
       "target": "project"
-    }
+    },
+    "xunit": "2.2.0-beta2-build3300",
+    "dotnet-test-xunit": "2.2.0-preview2-build1029"
   },
   "buildOptions": {
     "warningsAsErrors": true,
@@ -95,18 +97,15 @@
     //  }
     //},
     "netcoreapp1.0": {
-      "imports": [ "dnxcore50", "portable-net45+win8" ],
       "buildOptions": {
         "define": [ "COREFX", "ASYNC", "XUNIT2" ]
       },
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.0.0-rc2-3002702",
+          "version": "1.0.0",
           "type": "platform"
         },
-        "Microsoft.Data.Sqlite": "1.0.0-rc2-final",
-        "xunit": "2.1.0",
-        "dotnet-test-xunit": "1.0.0-rc3-*"
+        "Microsoft.Data.Sqlite": "1.0.0"
       }
     }
   }

diff --git a/Dapper.Tests/project.json b/Dapper.Tests/project.json
@@ -21,7 +21,9 @@
     },
     "Dapper.Contrib": {
       "target": "project"
-    }
+    },
+    "xunit": "2.2.0-beta2-build3300",
+    "dotnet-test-xunit": "2.2.0-preview2-build1029"
   },
   "buildOptions": {
     "warningsAsErrors": true,
@@ -126,18 +128,15 @@
     //  }
     //},
     "netcoreapp1.0": {
-      "imports": [ "dnxcore50", "portable-net45+win8" ],
       "buildOptions": {
         "define": [ "ASYNC", "COREFX", "XUNIT2", "SQLITE" ]
       },
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.0.0-rc2-3002702",
+          "version": "1.0.0",
           "type": "platform"
         },
-        "Microsoft.Data.Sqlite": "1.0.0-rc2-final",
-        "xunit": "2.1.0",
-        "dotnet-test-xunit": "1.0.0-rc3-*"
+        "Microsoft.Data.Sqlite": "1.0.0"
       }
     }
   }

diff --git a/Dapper/project.json b/Dapper/project.json
@@ -55,14 +55,24 @@
         "define": [ "ASYNC", "COREFX" ]
       },
       "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027",
-        "System.Data.SqlClient": "4.1.0-rc2-24027",
-        "System.Dynamic.Runtime": "4.0.11-rc2-24027",
-        "System.Reflection.Emit": "4.0.1-rc2-24027",
-        "System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027",
-        "System.Xml.XmlDocument": "4.0.1-rc2-24027",
-        "System.Collections.NonGeneric": "4.0.1-rc2-24027",
-        "System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
+        "System.Collections": "4.0.11",
+        "System.Collections.Concurrent": "4.0.12",
+        "System.Collections.NonGeneric": "4.0.1",
+        "System.Data.SqlClient": "4.1.0",
+        "System.Dynamic.Runtime": "4.0.11",
+        "System.Linq": "4.1.0",
+        "System.Reflection": "4.1.0",
+        "System.Reflection.Emit": "4.0.1",
+        "System.Reflection.Emit.Lightweight": "4.0.1",
+        "System.Reflection.Extensions": "4.0.1",
+        "System.Reflection.TypeExtensions": "4.1.0",
+        "System.Runtime": "4.1.0",
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Runtime.InteropServices": "4.1.0",
+        "System.Text.RegularExpressions": "4.1.0",
+        "System.Threading": "4.0.11",
+        "System.Xml.XDocument": "4.0.11",
+        "System.Xml.XmlDocument": "4.0.1"
       }
     }
   }

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "1.0.0-preview1-002702"
+    "version": "1.0.0-preview2-003121"
   },
   "projects": [
     "Dapper",

diff --git a/tools/install.ps1 b/tools/install.ps1
@@ -23,12 +23,15 @@
     - lkg - last known good version on specific channel
     Note: LKG work is in progress. Once the work is finished, this will become new default
 .PARAMETER InstallDir
-    Default: %LocalAppData%\Microsoft\.dotnet
+    Default: %LocalAppData%\Microsoft\dotnet
     Path to where to install dotnet. Note that binaries will be placed directly in a given directory.
 .PARAMETER Architecture
     Default: <auto> - this value represents currently running OS architecture
     Architecture of dotnet binaries to be installed.
     Possible values are: <auto>, x64 and x86
+.PARAMETER SharedRuntime
+    Default: false
+    Installs just the shared runtime bits, not the entire SDK
 .PARAMETER DebugSymbols
     If set the installer will include symbols in the installation.
 .PARAMETER DryRun
@@ -47,10 +50,11 @@
 #>
 [cmdletbinding()]
 param(
-   [string]$Channel="preview",
+   [string]$Channel="rel-1.0.0",
    [string]$Version="Latest",
    [string]$InstallDir="<auto>",
    [string]$Architecture="<auto>",
+   [switch]$SharedRuntime,
    [switch]$DebugSymbols, # TODO: Switch does not work yet. Symbols zip is not being uploaded yet.
    [switch]$DryRun,
    [switch]$NoPath,
@@ -68,11 +72,11 @@ $VersionRegEx="/\d+\.\d+[^/]+/"
 $OverrideNonVersionedFiles=$true
 
 function Say($str) {
-    Write-Host "dotnet_install: $str"
+    Write-Host "dotnet-install: $str"
 }
 
 function Say-Verbose($str) {
-    Write-Verbose "dotnet_install: $str"
+    Write-Verbose "dotnet-install: $str"
 }
 
 function Say-Invocation($Invocation) {
@@ -114,9 +118,22 @@ function Get-Version-Info-From-Version-Text([string]$VersionText) {
 function Get-Latest-Version-Info([string]$AzureFeed, [string]$AzureChannel, [string]$CLIArchitecture) {
     Say-Invocation $MyInvocation
 
-    $VersionFileUrl = "$AzureFeed/$AzureChannel/dnvm/latest.win.$CLIArchitecture.version"
+    $VersionFileUrl = $null
+    if ($SharedRuntime) {
+        $VersionFileUrl = "$AzureFeed/$AzureChannel/dnvm/latest.sharedfx.win.$CLIArchitecture.version"
+    }
+    else {
+        $VersionFileUrl = "$AzureFeed/Sdk/$AzureChannel/latest.version"
+    }
+
     $Response = Invoke-WebRequest -UseBasicParsing $VersionFileUrl
-    $VersionText = [Text.Encoding]::UTF8.GetString($Response.Content)
+
+    switch ($Response.Headers.'Content-Type'){
+        { ($_ -eq "application/octet-stream") } { $VersionText = [Text.Encoding]::UTF8.GetString($Response.Content) }
+        { ($_ -eq "text/plain") } { $VersionText = $Response.Content }
+        default { throw "``$Response.Headers.'Content-Type'`` is an unknown .version file content type." }
+    }
+
 
     $VersionInfo = Get-Version-Info-From-Version-Text $VersionText
 
@@ -130,9 +147,8 @@ function Get-Azure-Channel-From-Channel([string]$Channel) {
     # For compatibility with build scripts accept also directly Azure channels names
     switch ($Channel.ToLower()) {
         { ($_ -eq "future") -or ($_ -eq "dev") } { return "dev" }
-        { ($_ -eq "preview") -or ($_ -eq "beta") } { return "beta" }
         { $_ -eq "production" } { throw "Production channel does not exist yet" }
-        default { throw "``$Channel`` is an invalid channel name. Use one of the following: ``future``, ``preview``, ``production``" }
+        default { return $_ }
     }
 }
 
@@ -153,13 +169,16 @@ function Get-Download-Links([string]$AzureFeed, [string]$AzureChannel, [string]$
     Say-Invocation $MyInvocation
 
     $ret = @()
-    $files = @("dotnet-dev")
 
-    foreach ($file in $files) {
-        $PayloadURL = "$AzureFeed/$AzureChannel/Binaries/$SpecificVersion/$file-win-$CLIArchitecture.$SpecificVersion.zip"
-        Say-Verbose "Constructed payload URL: $PayloadURL"
-        $ret += $PayloadURL
+    if ($SharedRuntime) {
+        $PayloadURL = "$AzureFeed/$AzureChannel/Binaries/$SpecificVersion/dotnet-win-$CLIArchitecture.$SpecificVersion.zip"
     }
+    else {
+        $PayloadURL = "$AzureFeed/Sdk/$SpecificVersion/dotnet-dev-win-$CLIArchitecture.$SpecificVersion.zip"
+    }
+
+    Say-Verbose "Constructed payload URL: $PayloadURL"
+    $ret += $PayloadURL
 
     return $ret
 }
@@ -169,7 +188,7 @@ function Get-User-Share-Path() {
 
     $InstallRoot = $env:DOTNET_INSTALL_DIR
     if (!$InstallRoot) {
-        $InstallRoot = "$env:LocalAppData\Microsoft\.dotnet"
+        $InstallRoot = "$env:LocalAppData\Microsoft\dotnet"
     }
     return $InstallRoot
 }
@@ -300,7 +319,7 @@ if ($DryRun) {
         Say "- $DownloadLink"
     }
     Say "Repeatable invocation: .\$($MyInvocation.MyCommand) -Version $SpecificVersion -Channel $Channel -Architecture $CLIArchitecture -InstallDir $InstallDir"
-    return
+    exit 0
 }
 
 $InstallRoot = Resolve-Installation-Path $InstallDir
@@ -310,7 +329,7 @@ $IsSdkInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -Relativ
 Say-Verbose ".NET SDK installed? $IsSdkInstalled"
 if ($IsSdkInstalled) {
     Say ".NET SDK version $SpecificVersion is already installed."
-    return
+    exit 0
 }
 
 New-Item -ItemType Directory -Force -Path $InstallRoot | Out-Null
@@ -329,10 +348,11 @@ foreach ($DownloadLink in $DownloadLinks) {
 $BinPath = Get-Absolute-Path $(Join-Path -Path $InstallRoot -ChildPath $BinFolderRelativePath)
 if (-Not $NoPath) {
     Say "Adding to current process PATH: `"$BinPath`". Note: This change will not be visible if PowerShell was run as a child process."
-    $env:path += ";$BinPath"
+    $env:path = "$BinPath;" + $env:path
 }
 else {
     Say "Binaries of dotnet can be found in $BinPath"
 }
 
-Say "Installation finished"
+Say "Installation finished"
+exit 0