Skip to content

Commit

Permalink
Changing the dotnet cli version to the preview2 release, and changing… (
Browse files Browse the repository at this point in the history
#713)

* Changing the dotnet cli version to the preview2 release, and changing the .NET references to stable release versions.

* Adding runFunTests.sh as well.
  • Loading branch information
toddm committed Jun 24, 2016
1 parent 38c0003 commit b0093a8
Show file tree
Hide file tree
Showing 46 changed files with 118 additions and 118 deletions.
2 changes: 1 addition & 1 deletion build.sh
Expand Up @@ -17,7 +17,7 @@ curl -o cli/dotnet-install.sh https://raw.githubusercontent.com/dotnet/cli/rel/1

# Run install.sh
chmod +x cli/dotnet-install.sh
cli/dotnet-install.sh -i cli -c preview -v 1.0.0-preview2-003030
cli/dotnet-install.sh -i cli -c preview -v 1.0.0-preview2-003121

# Display current version
DOTNET="$(pwd)/cli/dotnet"
Expand Down
4 changes: 2 additions & 2 deletions build/common.ps1
Expand Up @@ -176,7 +176,7 @@ Function Install-DotnetCLI {

wget 'https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1' -OutFile 'cli/dotnet-install.ps1'

& cli/dotnet-install.ps1 -Channel preview -i $CLIRoot -Version 1.0.0-preview2-003030
& cli/dotnet-install.ps1 -Channel preview -i $CLIRoot -Version 1.0.0-preview2-003121

if (-not (Test-Path $DotNetExe)) {
Error-Log "Unable to find dotnet.exe. The CLI install may have failed." -Fatal
Expand Down Expand Up @@ -647,4 +647,4 @@ Function Invoke-ILMerge {
finally {
popd
}
}
}
2 changes: 1 addition & 1 deletion scripts/funcTests/runFuncTests.sh
Expand Up @@ -21,7 +21,7 @@ curl -o cli/dotnet-install.sh https://raw.githubusercontent.com/dotnet/cli/rel/1

# Run install.sh
chmod +x cli/dotnet-install.sh
cli/dotnet-install.sh -i cli -c preview -v 1.0.0-preview2-003030
cli/dotnet-install.sh -i cli -c preview -v 1.0.0-preview2-003121

# Display current version
DOTNET="$(pwd)/cli/dotnet"
Expand Down
4 changes: 2 additions & 2 deletions src/NuGet.Core/NuGet.Client/project.json
Expand Up @@ -50,7 +50,7 @@
"portable-net45+win8"
],
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00"
"NETStandard.Library": "1.6.0"
},
"buildOptions": {
"define": [
Expand All @@ -59,4 +59,4 @@
}
}
}
}
}
10 changes: 5 additions & 5 deletions src/NuGet.Core/NuGet.CommandLine.XPlat/project.json
Expand Up @@ -21,23 +21,23 @@
}
},
"dependencies": {
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24128-00",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"version": "1.0.0-*",
"type": "build"
},
"NuGet.Commands": {
"target": "project"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24128-00"
"System.Runtime.Serialization.Primitives": "4.1.1"
},
"commands": {
"NuGet.CommandLine.XPlat": "NuGet.CommandLine.XPlat"
},
"frameworks": {
"net46": {
"dependencies": {
"System.Runtime": "4.1.0-rc3-24128-00"
"System.Runtime": "4.1.0"
},
"buildOptions": {
"define": [
Expand All @@ -54,7 +54,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004338"
"version": "1.0.0"
}
},
"buildOptions": {
Expand All @@ -64,4 +64,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions src/NuGet.Core/NuGet.Commands/project.json
Expand Up @@ -73,8 +73,8 @@
"portable-net45+win8"
],
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00",
"System.Xml.XDocument": "4.0.11-rc3-24128-00"
"NETStandard.Library": "1.6.0",
"System.Xml.XDocument": "4.0.11"
},
"buildOptions": {
"define": [
Expand All @@ -83,4 +83,4 @@
}
}
}
}
}
10 changes: 5 additions & 5 deletions src/NuGet.Core/NuGet.Common/project.json
Expand Up @@ -35,10 +35,10 @@
},
"netstandard1.3": {
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00",
"System.Security.Cryptography.Algorithms": "4.2.0-rc3-24128-00",
"System.Diagnostics.Process": "4.1.0-rc3-24128-00",
"System.Threading.Thread": "4.0.0-rc3-24128-00"
"NETStandard.Library": "1.6.0",
"System.Security.Cryptography.Algorithms": "4.2.0",
"System.Diagnostics.Process": "4.1.0",
"System.Threading.Thread": "4.0.0"
},
"buildOptions": {
"define": [
Expand All @@ -47,4 +47,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions src/NuGet.Core/NuGet.Configuration/project.json
Expand Up @@ -46,8 +46,8 @@
},
"netstandard1.3": {
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00",
"System.Xml.XDocument": "4.0.11-rc3-24128-00"
"NETStandard.Library": "1.6.0",
"System.Xml.XDocument": "4.0.11"
},
"buildOptions": {
"define": [
Expand All @@ -56,4 +56,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions src/NuGet.Core/NuGet.ContentModel/project.json
Expand Up @@ -28,8 +28,8 @@
},
"netstandard1.3": {
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00",
"System.ObjectModel": "4.0.12-rc3-24128-00"
"NETStandard.Library": "1.6.0",
"System.ObjectModel": "4.0.12"
},
"imports": [
"dotnet5.6",
Expand All @@ -43,4 +43,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/NuGet.Core/NuGet.DependencyResolver.Core/project.json
Expand Up @@ -51,7 +51,7 @@
"portable-net45+win8"
],
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00"
"NETStandard.Library": "1.6.0"
},
"buildOptions": {
"define": [
Expand All @@ -60,4 +60,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/NuGet.Core/NuGet.DependencyResolver/project.json
Expand Up @@ -44,7 +44,7 @@
"portable-net45+win8"
],
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00"
"NETStandard.Library": "1.6.0"
},
"buildOptions": {
"define": [
Expand All @@ -53,4 +53,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/NuGet.Core/NuGet.Frameworks/project.json
Expand Up @@ -42,7 +42,7 @@
},
"netstandard1.3": {
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00"
"NETStandard.Library": "1.6.0"
},
"buildOptions": {
"define": [
Expand All @@ -51,4 +51,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/NuGet.Core/NuGet.LibraryModel/project.json
Expand Up @@ -36,7 +36,7 @@
},
"netstandard1.3": {
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00"
"NETStandard.Library": "1.6.0"
},
"imports": [
"dotnet5.6",
Expand All @@ -50,4 +50,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/NuGet.Core/NuGet.Packaging.Core.Types/project.json
Expand Up @@ -36,7 +36,7 @@
},
"netstandard1.3": {
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00"
"NETStandard.Library": "1.6.0"
},
"imports": [
"dotnet5.6",
Expand All @@ -50,4 +50,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions src/NuGet.Core/NuGet.Packaging.Core/project.json
Expand Up @@ -44,8 +44,8 @@
},
"netstandard1.3": {
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00",
"System.Xml.XDocument": "4.0.11-rc3-24128-00"
"NETStandard.Library": "1.6.0",
"System.Xml.XDocument": "4.0.11"
},
"imports": [
"dotnet5.6",
Expand All @@ -59,4 +59,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions src/NuGet.Core/NuGet.Packaging/project.json
Expand Up @@ -50,8 +50,8 @@
},
"netstandard1.3": {
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00",
"System.IO.Compression": "4.1.0-rc3-24128-00"
"NETStandard.Library": "1.6.0",
"System.IO.Compression": "4.1.0"
},
"imports": [
"dotnet5.6",
Expand All @@ -65,4 +65,4 @@
}
}
}
}
}
8 changes: 4 additions & 4 deletions src/NuGet.Core/NuGet.ProjectModel/project.json
Expand Up @@ -40,9 +40,9 @@
"portable-net45+win8"
],
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24128-00",
"System.Threading.Thread": "4.0.0-rc3-24128-00"
"NETStandard.Library": "1.6.0",
"System.Dynamic.Runtime": "4.0.11",
"System.Threading.Thread": "4.0.0"
},
"buildOptions": {
"define": [
Expand All @@ -51,4 +51,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions src/NuGet.Core/NuGet.Protocol.Core.Types/project.json
Expand Up @@ -49,8 +49,8 @@
},
"netstandard1.3": {
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00",
"System.Net.Http": "4.1.0-rc3-24128-00"
"NETStandard.Library": "1.6.0",
"System.Net.Http": "4.1.0"
},
"imports": [
"dotnet5.6",
Expand All @@ -64,4 +64,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions src/NuGet.Core/NuGet.Protocol.Core.v3/project.json
Expand Up @@ -58,8 +58,8 @@
"portable-net45+win8"
],
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24128-00"
"NETStandard.Library": "1.6.0",
"System.Dynamic.Runtime": "4.0.11"
},
"buildOptions": {
"define": [
Expand All @@ -68,4 +68,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/NuGet.Core/NuGet.Protocol.Test.Utility/project.json
Expand Up @@ -38,7 +38,7 @@
"portable-net45+win8"
],
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00"
"NETStandard.Library": "1.6.0"
},
"buildOptions": {
"define": [
Expand All @@ -47,4 +47,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/NuGet.Core/NuGet.Repositories/project.json
Expand Up @@ -33,7 +33,7 @@
},
"netstandard1.3": {
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00"
"NETStandard.Library": "1.6.0"
},
"imports": [
"dotnet5.6",
Expand All @@ -47,4 +47,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/NuGet.Core/NuGet.Resolver/project.json
Expand Up @@ -40,7 +40,7 @@
},
"netstandard1.3": {
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24128-00"
"NETStandard.Library": "1.6.0"
},
"imports": [
"dotnet5.6",
Expand All @@ -54,4 +54,4 @@
}
}
}
}
}

0 comments on commit b0093a8

Please sign in to comment.