mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2954 from dotnet/piotrpMSFT/preview1to2

Browse source 
preview1 --> preview2
This commit is contained in:
Sridhar Periyasamy 2016-05-10 16:54:15 -07:00
commit c01331f2f9
122 changed files with 147 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json
View file

@ -11,7 +11,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
}
},
"imports": [

2
TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json
View file

@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"Microsoft.NETCore.App": "1.0.0-rc3-*",
"EmptyLibrary": "1.0.0-*"
},
"frameworks": {

2
TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json
View file

@ -3,7 +3,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
}
},
"dnx451": {}

2
TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"Newtonsoft.Json": "8.0.3"
}

2
TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json
View file

@ -3,7 +3,7 @@
"netcoreapp1.0": {
"imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
}
}
},

2
TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json
View file

@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"Microsoft.NETCore.App": "1.0.0-rc3-*",
"Microsoft.Web.Administration": "7.0.0"
},
"frameworks": {

2
TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestPackages/ToolWithOutputName/project.json
View file

@ -9,7 +9,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
}
}
}

4
TestAssets/TestPackages/dotnet-dependency-context-test/project.json
View file

@ -1,12 +1,12 @@
{
"version": "1.0.0-preview1-*",
"version": "1.0.0-rc-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"Microsoft.Extensions.DependencyModel": { "target": "project" }
},

4
TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-preview1-*",
"version": "1.0.0-rc-*",
"compilationOptions": {
"emitEntryPoint": true
},
@ -10,7 +10,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
"Microsoft.DotNet.ProjectModel": { "target": "project" },

4
TestAssets/TestPackages/dotnet-desktop-and-portable/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-preview1-*",
"version": "1.0.0-rc-*",
"compilationOptions": {
"emitEntryPoint": true
},
@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
}
}
},

2
TestAssets/TestPackages/dotnet-desktop-binding-redirects/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-preview1-*",
"version": "1.0.0-rc-*",
"compilationOptions": {
"emitEntryPoint": true
},

2
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestPackages/dotnet-portable/project.json
View file

@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
}
}
}

2
TestAssets/TestProjects/AppWithBomGlobalJson/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json
View file

@ -5,7 +5,7 @@
},
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*",
"version": "1.0.0-rc3-*",
"type": "platform"
}
},

2
TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"Microsoft.NETCore.App": "1.0.0-rc3-*",
"dotnet-hello": {
"version": "1.0.0",
"target": "package"

2
TestAssets/TestProjects/AppWithDirectDependency/project.json
View file

@ -5,7 +5,7 @@
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"Microsoft.NETCore.App": "1.0.0-rc3-*",
"dotnet-hello": {
"version": "1.0.0",
"target": "package"

2
TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*",
"version": "1.0.0-rc3-*",
"type": "platform"
},
"xunit.core": "2.1.0",

2
TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json
View file

@ -8,7 +8,7 @@
"target": "package"
},
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*",
"version": "1.0.0-rc3-*",
"type": "platform"
}
},

2
TestAssets/TestProjects/AppWithOutputAssemblyName/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/AppWithToolDependency/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/CompileFail/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json
View file

@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
}
}
}

2
TestAssets/TestProjects/DependencyContextFromTool/project.json
View file

@ -12,7 +12,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
}
}
}

2
TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json
View file

@ -9,7 +9,7 @@
"netstandard1.5": {
"imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
}
},
"net451": {}

2
TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json
View file

@ -5,7 +5,7 @@
"preserveCompilationContext": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"Microsoft.NETCore.App": "1.0.0-rc3-*",
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {

2
TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"Microsoft.NETCore.App": "1.0.0-rc3-*",
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {

2
TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json
View file

@ -7,7 +7,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"DependencyContextValidator": "1.0.0-*"
},

2
TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"DependencyContextValidator": "1.0.0-*"
},

2
TestAssets/TestProjects/EndToEndTestApp/project.json
View file

@ -14,7 +14,7 @@
}
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"packOptions": {
"files": {

2
TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json
View file

@ -9,7 +9,7 @@
],
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"tools": {
"dotnet-compile-fsc": {

2
TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
View file

@ -12,7 +12,7 @@
"version": "1.0.0-*",
"target": "project"
},
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"Microsoft.NETCore.App": "1.0.0-rc3-*",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221"
},
"tools": {

2
TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json
View file

@ -9,7 +9,7 @@
],
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"tools": {
"dotnet-compile-fsc": {

2
TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json
View file

@ -16,7 +16,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
}
},
"imports": [

2
TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json
View file

@ -14,7 +14,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"imports": [
"dnxcore50",

2
TestAssets/TestProjects/OutputStandardOutputAndError/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/PortableTests/PortableApp/project.json
View file

@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
}
}
}

2
TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json
View file

@ -11,7 +11,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
}
}
}

2
TestAssets/TestProjects/PortableTests/PortableAppWithIntentionalManagedDowngrade/project.json
View file

@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"System.Linq": "4.0.0"
},

2
TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json
View file

@ -7,7 +7,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},

2
TestAssets/TestProjects/ResourcesTests/TestApp/project.json
View file

@ -7,7 +7,7 @@
"Microsoft.Data.OData": "5.6.4",
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"TestLibraryWithResources": { "target": "project" }
},

2
TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json
View file

@ -7,7 +7,7 @@
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*",
"version": "1.0.0-rc3-*",
"type": "platform"
}
}

2
TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json
View file

@ -6,7 +6,7 @@
},
"dependencies": {
"TestLibrary": "1.0.0-*",
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/TestAppSimple/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/TestAppWithArgs/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-3002498"
"version": "1.0.0-rc3-*"
},
"LibraryWithBuildDependency": { "target": "project" }
},

2
TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-3002498"
"version": "1.0.0-rc3-*"
},
"Microsoft.Net.Compilers": {
"type": "build",

2
TestAssets/TestProjects/TestAppWithContentPackage/project.json
View file

@ -5,7 +5,7 @@
"outputName": "AppWithContentPackage"
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*",
"Microsoft.NETCore.App": "1.0.0-rc3-*",
"SharedContentA": "1.0.0-*"
},
"frameworks": {

2
TestAssets/TestProjects/TestAppWithContents/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"content": "testcontentfile.txt",
"frameworks": {

2
TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
View file

@ -9,7 +9,7 @@
"target": "project",
"version": "1.0.0-*"
},
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/TestAppWithScripts/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json
View file

@ -9,7 +9,7 @@
"target": "project",
"version": "1.0.0-*"
},
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/TestAppWithUnicodéPath/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json
View file

@ -9,7 +9,7 @@
"target": "project",
"version": "1.0.0-*"
},
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json
View file

@ -5,7 +5,7 @@
"netcoreapp1.0": {
"imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
}
},
"net451": {

2
TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json
View file

@ -5,7 +5,7 @@
"netcoreapp1.0": {
"imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
}
},
"netcore50": {

2
TestAssets/TestProjects/TestMscorlibReference/project.json
View file

@ -4,7 +4,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
}
},
"net451": {

2
TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*",
"version": "1.0.0-rc3-*",
"type": "platform"
},
},

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"L11": "1.0.0-*",
"L12": "1.0.0-*",
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"L12": "1.0.0-*",
"L21": "1.0.0-*",
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netstandard1.5": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"L22": "1.0.0-*",
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netstandard1.5": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json
View file

@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netstandard1.5": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json
View file

@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netstandard1.5": {

2
TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/TestProjectWithResource/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/TestSimpleIncrementalApp/project.json
View file

@ -5,7 +5,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"frameworks": {
"netcoreapp1.0": { }

2
TestAssets/TestProjects/TestSystemCoreReference/project.json
View file

@ -4,7 +4,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
}
},
"net451": {

2
TestAssets/TestProjects/TestSystemReference/project.json
View file

@ -4,7 +4,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-*"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
}
},
"net451": {

4
branchinfo.txt
View file

@ -4,5 +4,5 @@
MAJOR_VERSION=1
MINOR_VERSION=0
PATCH_VERSION=0
RELEASE_SUFFIX=preview1
CHANNEL=beta
RELEASE_SUFFIX=preview2
CHANNEL=preview

2
packaging/windows/clisdk/registrykeys.wxs
View file

@ -10,7 +10,7 @@
</Component>
<Component Id="SetupRegistry_x86_RC2_Compat_Key" Directory="TARGETDIR" Win64="no">
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\$(var.Platform)\sdk">
<RegistryValue Action="write" Name="1.0.0-preview1" Type="integer" Value="1" KeyPath="yes"/>
<RegistryValue Action="write" Name="1.0.0-preview2" Type="integer" Value="1" KeyPath="yes"/>
</RegistryKey>
</Component>
</ComponentGroup>

3
pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj
View file

@ -42,8 +42,7 @@
</ItemGroup>
<PropertyGroup>
<!-- For RC2 we need to start with -rc2-3 so that it is higher then the last published -rc2-23931 -->
<VersionSuffix>-rc2-3$(CLIBuildVersion)</VersionSuffix>
<VersionSuffix>-rc3-$(CLIBuildVersion)</VersionSuffix>
</PropertyGroup>
</Target>

2
scripts/dotnet-cli-build/PublishTargets.cs
View file

@ -183,7 +183,7 @@ namespace Microsoft.DotNet.Cli.Build
[Target(
nameof(PublishTargets.PublishInstallerFilesToAzure),
nameof(PublishTargets.PublishArchivesToAzure),
nameof(PublishTargets.PublishDebFilesToDebianRepo),
/*nameof(PublishTargets.PublishDebFilesToDebianRepo),*/ //https://github.com/dotnet/cli/issues/2973
nameof(PublishTargets.PublishCoreHostPackages),
nameof(PublishTargets.PublishCliVersionBadge))]
public static BuildTargetResult PublishArtifacts(BuildTargetContext c) => c.Success();

2
scripts/dotnet-cli-build/Utils/BuildVersion.cs
View file

@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build
public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}";
public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}";
public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc2-3{CommitCountString}";
public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc3-{CommitCountString}";
public string ProductionVersion => $"{Major}.{Minor}.{Patch}";
}
}

2
scripts/dotnet-cli-build/Utils/HostVersion.cs
View file

@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Cli.Build
public override int Major => 1;
public override int Minor => 0;
public override int Patch => 1;
public override string ReleaseSuffix => "rc2";
public override string ReleaseSuffix => "rc3";
public string LatestHostVersionNoSuffix => $"{Major}.{Minor}.{Patch}";
public string LatestHostFxrVersionNoSuffix => $"{Major}.{Minor}.{Patch}";
public string LatestHostPolicyVersionNoSuffix => $"{Major}.{Minor}.{Patch}";

4
scripts/dotnet-cli-build/Utils/Monikers.cs
View file

@ -32,7 +32,7 @@ namespace Microsoft.DotNet.Cli.Build
case "beta":
case "rc1":
case "rc2":
case "preview1":
case "preview":
case "rtm":
packageName = "dotnet";
break;
@ -57,7 +57,7 @@ namespace Microsoft.DotNet.Cli.Build
case "beta":
case "rc1":
case "rc2":
case "preview1":
case "preview":
case "rtm":
packagePrefix = "dotnet";
break;

5
scripts/obtain/dotnet-install.ps1 vendored
View file

@ -47,7 +47,7 @@
#>
[cmdletbinding()]
param(
[string]$Channel="preview",
[string]$Channel="beta",
[string]$Version="Latest",
[string]$InstallDir="<auto>",
[string]$Architecture="<auto>",
@ -130,7 +130,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 "beta") } { return "beta" }
{ ($_ -eq "preview") } { return "preview" }
{ $_ -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``" }
}

8
scripts/obtain/dotnet-install.sh vendored
View file

@ -288,10 +288,14 @@ get_azure_channel_from_channel() {
echo "dev"
return 0
;;
preview|beta)
beta)
echo "beta"
return 0
;;
preview)
echo "preview"
return 0
;;
production)
say_err "Production channel does not exist yet"
return 1
@ -528,7 +532,7 @@ local_version_file_relative_path="/.version"
bin_folder_relative_path=""
temporary_file_template="${TMPDIR:-/tmp}/dotnet.XXXXXXXXX"
channel="preview"
channel="beta"
version="Latest"
install_dir="<auto>"
architecture="<auto>"

9
scripts/obtain/install.ps1
View file

@ -47,7 +47,7 @@
#>
[cmdletbinding()]
param(
[string]$Channel="preview",
[string]$Channel="beta",
[string]$Version="Latest",
[string]$InstallDir="<auto>",
[string]$Architecture="<auto>",
@ -68,11 +68,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) {
@ -130,7 +130,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 "beta") } { return "beta" }
{ ($_ -eq "preview") } { return "preview" }
{ $_ -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``" }
}

14
scripts/obtain/install.sh
View file

@ -47,7 +47,7 @@ say_err() {
say() {
# using stream 3 (defined in the beginning) to not interfere with stdout of functions
# which may be used as return value
printf "%b\n" "${cyan:-}dotnet_install:${normal:-} $1" >&3
printf "%b\n" "${cyan:-}dotnet-install:${normal:-} $1" >&3
}
say_verbose() {
@ -245,7 +245,7 @@ is_dotnet_package_installed() {
local install_root=$1
local relative_path_to_package=$2
local specific_version=$3
local specific_version=${3//[$'\t\r\n']}
local dotnet_package_path=$(combine_paths $(combine_paths $install_root $relative_path_to_package) $specific_version)
say_verbose "is_dotnet_package_installed: dotnet_package_path=$dotnet_package_path"
@ -288,10 +288,14 @@ get_azure_channel_from_channel() {
echo "dev"
return 0
;;
preview|beta)
beta)
echo "beta"
return 0
;;
preview)
echo "preview"
return 0
;;
production)
say_err "Production channel does not exist yet"
return 1
@ -343,7 +347,7 @@ construct_download_link() {
local azure_feed=$1
local azure_channel=$2
local normalized_architecture=$3
local specific_version=$4
local specific_version=${4//[$'\t\r\n']}
local osname=$(get_current_os_name)
@ -528,7 +532,7 @@ local_version_file_relative_path="/.version"
bin_folder_relative_path=""
temporary_file_template="${TMPDIR:-/tmp}/dotnet.XXXXXXXXX"
channel="preview"
channel="beta"
version="Latest"
install_dir="<auto>"
architecture="<auto>"

2
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-preview1-*",
"version": "1.0.0-preview2-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk",
"warningsAsErrors": true

2
src/Microsoft.DotNet.Compiler.Common/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-preview1-*",
"version": "1.0.0-preview2-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},

2
src/Microsoft.DotNet.Files/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-preview1-*",
"version": "1.0.0-preview2-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},

2
src/Microsoft.DotNet.InternalAbstractions/project.json
View file

@ -1,6 +1,6 @@
{
"description": "Abstractions for making code that uses file system and environment testable.",
"version": "1.0.0-rc2-*",
"version": "1.0.0-rc3-*",
"repository": {
"type": "git",
"url": "git://github.com/dotnet/cli"

2
src/Microsoft.DotNet.ProjectModel.Loader/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-preview1-*",
"version": "1.0.0-preview2-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},

2
src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-preview1-*",
"version": "1.0.0-preview2-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},

2
src/Microsoft.DotNet.ProjectModel/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-rc2-*",
"version": "1.0.0-rc3-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},

2
src/Microsoft.DotNet.TestFramework/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-preview1-*",
"version": "1.0.0-preview2-*",
"description": "Microsoft.DotNet.TestFramework Class Library",
"tags": [
""

2
src/Microsoft.Extensions.DependencyModel/project.json
View file

@ -1,6 +1,6 @@
{
"description": "Abstractions for reading `.deps` files.",
"version": "1.0.0-rc2-*",
"version": "1.0.0-rc3-*",
"repository": {
"type": "git",
"url": "git://github.com/dotnet/cli"

2
src/Microsoft.Extensions.Testing.Abstractions/project.json
View file

@ -1,6 +1,6 @@
{
"description": "Abstractions for test runners to communicate to a tool, such as Visual Studio.",
"version": "1.0.0-preview1-*",
"version": "1.0.0-preview2-*",
"repository": {
"type": "git",
"url": "git://github.com/dotnet/cli"

2
src/compilers/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01",
"Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160429-01",

4
src/dotnet-compile-fsc/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-preview1-*",
"version": "1.0.0-preview2-*",
"compilationOptions": {
"emitEntryPoint": true
},
@ -16,7 +16,7 @@
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
}
},
"frameworks": {

4
src/dotnet/project.json
View file

@ -1,5 +1,5 @@
{
"version": "1.0.0-preview1-*",
"version": "1.0.0-preview2-*",
"compilationOptions": {
"emitEntryPoint": true
},
@ -33,7 +33,7 @@
"Microsoft.NETCore.TestHost": "1.0.0-rc2-24027",
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-24027",

2
test/ArgumentForwardingTests/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"Microsoft.DotNet.ProjectModel": {

2
test/ArgumentsReflector/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
},
"frameworks": {

2
test/EndToEnd/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"Microsoft.DotNet.ProjectModel": {

2
test/Kestrel.Tests/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"Microsoft.DotNet.Tools.Tests.Utilities": {

2
test/Microsoft.DotNet.Cli.Utils.Tests/project.json
View file

@ -7,7 +7,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",

2
test/Microsoft.DotNet.Compiler.Common.Tests/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"Microsoft.DotNet.Tools.Tests.Utilities": {

Some files were not shown because too many files have changed in this diff Show more