From 9ffe91f3673e7dd0094222ca08ffbf229866b290 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 3 Jun 2016 16:35:00 -0500 Subject: [PATCH 01/97] Move dependency from Microsoft.NETCore.Runtime to Microsoft.NETCore.Runtime.CoreCLR. --- .../PerformanceTestProjects/TwoTargetApp/project.json | 2 +- .../TwoTargetGraph/TwoTargetP0/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP0/project.json | 2 +- build_projects/dotnet-cli-build/project.json | 2 +- build_projects/update-dependencies/project.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index 493cbe24e..37e306738 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -16,7 +16,7 @@ "netstandard1.6": { "dependencies": { "NETStandard.Library": "1.6.0-rc3-24201-00", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24201-00" + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24201-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index fe7317460..d2fbd7413 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -20,7 +20,7 @@ "netstandard1.6": { "dependencies": { "NETStandard.Library": "1.6.0-rc3-24201-00", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24201-00" + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24201-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 1431fb0dd..7b2dbaaa9 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -20,7 +20,7 @@ "netstandard1.6": { "dependencies": { "NETStandard.Library": "1.6.0-rc3-24201-00", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24201-00" + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24201-00" } } }, diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 2c29d03d6..db3eb2774 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "NETStandard.Library": "1.6.0-rc3-24201-00", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24201-00", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24201-00", "Microsoft.CSharp": "4.0.1-rc3-24201-00", "System.Dynamic.Runtime": "4.0.11-rc3-24201-00", "System.Reflection.Metadata": "1.3.0-rc3-24201-00", diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 0b52ee8f2..0fce7a1d8 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -7,7 +7,7 @@ "dependencies": { "NETStandard.Library": "1.6.0-rc3-24201-00", "Microsoft.CSharp": "4.0.1-rc3-24201-00", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24201-00", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24201-00", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" From 4f95bc001011ca85529474d8786b4e6570b2aa58 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Sat, 4 Jun 2016 00:00:28 -0500 Subject: [PATCH 02/97] Update CoreSetup to rc3-004397 --- .../AppWithDirectDependencyDesktopAndPortable/project.json | 2 +- .../TestProjectWithUnresolvedDependency/project.json | 2 +- .../DthTestProjects/src/BrokenProjectPathSample/project.json | 2 +- .../DthTestProjects/src/EmptyConsoleApp/project.json | 2 +- .../DthTestProjects/src/EmptyNetCoreApp/project.json | 2 +- .../DthTestProjects/src/FailReleaseProject/project.json | 2 +- .../src/IncompatiblePackageSample/project.json | 2 +- .../IncorrectGlobalJson/src/Project1/project.json | 2 +- TestAssets/TestPackages/ToolWithOutputName/project.json | 2 +- .../TestPackages/dotnet-dependency-context-test/project.json | 2 +- .../TestPackages/dotnet-dependency-tool-invoker/project.json | 2 +- .../TestPackages/dotnet-desktop-and-portable/project.json | 2 +- .../TestPackages/dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-hello/v2/dotnet-hello/project.json | 2 +- TestAssets/TestPackages/dotnet-portable/project.json | 2 +- .../TestProjects/AppWithAppDependency/TestApp1/project.json | 2 +- .../TestProjects/AppWithAppDependency/TestApp2/project.json | 2 +- TestAssets/TestProjects/AppWithBomGlobalJson/project.json | 2 +- .../AppWithDependencyOnToolWithOutputName/project.json | 2 +- .../TestProjects/AppWithDirectAndToolDependency/project.json | 2 +- TestAssets/TestProjects/AppWithDirectDependency/project.json | 2 +- .../AppWithDirectDependencyAndTypeBuild/project.json | 2 +- .../AppWithDirectDependencyWithOutputName/project.json | 2 +- .../TestProjects/AppWithOutputAssemblyName/project.json | 2 +- TestAssets/TestProjects/AppWithToolDependency/project.json | 2 +- TestAssets/TestProjects/CompileFail/project.json | 2 +- .../DependencyChangeTest/PortableApp_Standalone/project.json | 2 +- .../TestProjects/DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/TestApp/project.json | 2 +- .../DependencyContextValidator/TestAppDeps/project.json | 2 +- .../DependencyContextValidator/TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- TestAssets/TestProjects/EndToEndTestApp/project.json | 2 +- .../FSharpTestProjects/CompileFailApp/project.json | 2 +- .../TestProjects/FSharpTestProjects/TestApp/project.json | 2 +- .../FSharpTestProjects/TestAppWithArgs/project.json | 2 +- .../TestProjects/KestrelSample/KestrelPortable/project.json | 2 +- .../TestProjects/KestrelSample/KestrelStandalone/project.json | 2 +- .../TestProjects/OutputStandardOutputAndError/project.json | 2 +- .../PerformanceTestProjects/SingleTargetApp/project.json | 2 +- .../SingleTargetGraph/SingleTargetP0/project.json | 2 +- .../SingleTargetGraph/SingleTargetP1/project.json | 2 +- .../SingleTargetGraph/SingleTargetP2/project.json | 2 +- .../PerformanceTestProjects/TwoTargetApp/project.json | 2 +- .../TwoTargetGraph/TwoTargetP0/project.json | 2 +- .../TwoTargetGraph/TwoTargetP1/project.json | 2 +- .../TwoTargetGraph/TwoTargetP2/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP0/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP1/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP2/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP3/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP4/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP5/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP6/project.json | 2 +- .../TestProjects/PortableTests/PortableApp/project.json | 2 +- .../PortableTests/PortableAppCompilationContext/project.json | 2 +- .../PortableTests/PortableAppWithNative/project.json | 2 +- .../TestProjects/PortableTests/StandaloneApp/project.json | 2 +- .../ProjectsWithTests/MultipleFrameworkProject/project.json | 2 +- .../ProjectsWithTests/NetCoreAppOnlyProject/project.json | 2 +- TestAssets/TestProjects/ResourcesTests/TestApp/project.json | 2 +- .../TestProjects/RunTestsApps/TestAppMultiTarget/project.json | 2 +- .../TestAppCompilationContext/TestApp/project.json | 2 +- TestAssets/TestProjects/TestAppSimple/project.json | 2 +- TestAssets/TestProjects/TestAppWithArgs/project.json | 2 +- .../TestProjects/TestAppWithBuildDependency/App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestProjects/TestAppWithContentPackage/project.json | 2 +- TestAssets/TestProjects/TestAppWithContents/project.json | 2 +- .../TestProjects/TestAppWithLibrary/TestApp/project.json | 2 +- TestAssets/TestProjects/TestAppWithResourceDeps/project.json | 2 +- TestAssets/TestProjects/TestAppWithScripts/project.json | 2 +- .../TestAppWithTransitiveAppDependency/TestApp/project.json | 2 +- TestAssets/TestProjects/TestAppWithUnicodéPath/project.json | 2 +- .../TestAppWithWrapperProjectDependency/TestApp/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestProjects/TestMicrosoftCSharpReference/project.json | 2 +- .../TestMicrosoftCSharpReferenceMissingFramework/project.json | 2 +- TestAssets/TestProjects/TestMscorlibReference/project.json | 2 +- .../TestProjectContextBuildAllDedupe/project.json | 2 +- .../TestProjectToProjectDependencies/src/L0/project.json | 2 +- .../TestProjectWithCultureSpecificResource/project.json | 2 +- TestAssets/TestProjects/TestProjectWithResource/project.json | 2 +- TestAssets/TestProjects/TestSimpleIncrementalApp/project.json | 2 +- TestAssets/TestProjects/TestSystemCoreReference/project.json | 2 +- TestAssets/TestProjects/TestSystemReference/project.json | 2 +- build_projects/dotnet-cli-build/CliDependencyVersions.cs | 4 ++-- src/compilers/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- .../commands/dotnet-new/CSharp_Console/project.json.template | 2 +- .../commands/dotnet-new/FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 2 +- test/ArgumentForwardingTests/project.json | 2 +- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 2 +- test/Kestrel.Tests/project.json | 2 +- test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 2 +- test/Microsoft.DotNet.Compiler.Common.Tests/project.json | 2 +- test/Microsoft.DotNet.ProjectModel.Tests/project.json | 2 +- test/Microsoft.Extensions.DependencyModel.Tests/project.json | 2 +- test/Performance/project.json | 2 +- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 2 +- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 2 +- test/dotnet-compile.UnitTests/project.json | 2 +- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 2 +- test/dotnet-projectmodel-server.Tests/project.json | 2 +- test/dotnet-publish.Tests/project.json | 2 +- test/dotnet-resgen.Tests/project.json | 2 +- test/dotnet-run.Tests/project.json | 2 +- test/dotnet-run.UnitTests/project.json | 2 +- test/dotnet-test.Tests/project.json | 2 +- test/dotnet-test.UnitTests/project.json | 2 +- test/dotnet.Tests/project.json | 2 +- tools/MultiProjectValidator/project.json | 2 +- 120 files changed, 121 insertions(+), 121 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index 73d785c82..df556c0d8 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } }, "imports": [ diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 2d6344d4b..42fab0517 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 839d915bf..a485d6e85 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391", + "Microsoft.NETCore.App": "1.0.0-rc3-004397", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index cf11c6d49..f05e3a06e 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index fcd04fd2a..a407c1ff1 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index 35cb07bf6..13ae22720 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 6430397a0..3d57ebc08 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391", + "Microsoft.NETCore.App": "1.0.0-rc3-004397", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index b982a4f0e..93d964750 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index 5b261aab8..627ea0c89 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index ea78082a3..c07601bad 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index 55926f12a..679e988d2 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index a6765de66..9d9b77e0b 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index fde6cc710..b3c473baf 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index 4c5087ac8..83e55530b 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 6ef23aabe..560873362 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index c8e5bbf83..e83820834 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index e68fd1e3c..468d3d2d8 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index 0681caade..583af7029 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index 5aba8ead8..01233b101 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004391", + "version": "1.0.0-rc3-004397", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index b8a946e5c..6221b536a 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391", + "Microsoft.NETCore.App": "1.0.0-rc3-004397", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index a1933149c..b678565bf 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391", + "Microsoft.NETCore.App": "1.0.0-rc3-004397", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index a246fcd51..f3ce046bc 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004391", + "version": "1.0.0-rc3-004397", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index c498186a2..e8d8055fe 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004391", + "version": "1.0.0-rc3-004397", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 70e12b5f4..383df0f15 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index d5aa5ce51..ff4be1968 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index f00cd0cc5..42fc221b4 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index e68fd1e3c..468d3d2d8 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index e460761bf..08a4e4bae 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index f6edb66ed..6f1104fa8 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391", + "Microsoft.NETCore.App": "1.0.0-rc3-004397", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index fb3007473..d511a6c23 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391", + "Microsoft.NETCore.App": "1.0.0-rc3-004397", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 65e3d1112..cb5df5715 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index cf126d541..d5abb5d55 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index 16b028951..59b6a1a7e 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index 8bf13b4ec..795d16bfe 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index 8864f6dcf..c4cc97709 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004391", + "Microsoft.NETCore.App": "1.0.0-rc3-004397", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index ad27d40e8..0c9d8c336 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index c7dfcfdc6..58d4fca16 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index be47f9fc3..3cf1a5f9d 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index f00cd0cc5..42fc221b4 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index 2a22e71b4..f1a119c2c 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index b28365028..f1d7814fb 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index a50787c73..326d7888a 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 1c7ed6c89..9a01c74cb 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index 37e306738..f65bd7196 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index d2fbd7413..90090016d 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index 902272bfb..c504c5729 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index 134f3f977..462245d73 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 7b2dbaaa9..b15d62d6e 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index beb29611b..b2203a9b9 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index 4ed6429b0..7a151e5fa 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index 741389231..ee323c536 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index 8d9e7ebc2..86a0a0bc8 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index 134f3f977..462245d73 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index 134f3f977..462245d73 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index fbcfb3a50..a77605ef7 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index bc6e751c6..be1122e1a 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 9bae38fa7..7b01c345e 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index c9ab41143..7c19586e6 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index b85bf3917..40463c2ad 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -15,7 +15,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Linq.Expressions": "4.1.0-rc3-24201-00", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00" diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index 40f38369d..cf2fca841 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Linq.Expressions": "4.1.0-rc3-24201-00", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index 49c655046..582efdfd2 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 2a8008262..b91b8ba26 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004391", + "version": "1.0.0-rc3-004397", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index 4ef627563..26e0cd7db 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index f00cd0cc5..42fc221b4 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index f00cd0cc5..42fc221b4 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index 3baed9d9a..d3b109988 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index 1c76ce870..134c4ca52 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index 9a9904b2f..1cf499313 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391", + "Microsoft.NETCore.App": "1.0.0-rc3-004397", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 5173e47c8..62406b34f 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index cbcee04f6..238397eba 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index 5b13124c6..31276657e 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391", + "Microsoft.NETCore.App": "1.0.0-rc3-004397", "Microsoft.CSharp": "4.0.1-rc3-24201-00", "System.Dynamic.Runtime": "4.0.11-rc3-24201-00", "System.Reflection.Metadata": "1.3.0-rc3-24201-00", diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index d7478a434..754b3ce78 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index a708c4984..abc3bc56b 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index f00cd0cc5..42fc221b4 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index cbcee04f6..238397eba 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index e5a12cea5..4a3436909 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 0931e08dd..efc497482 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,7 +5,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" } }, "net451": { diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index c701f0f79..3bfda0844 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,7 +5,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" } }, "netcore50": { diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 39d4270b8..3e9984022 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index a3a3813db..10ae61f21 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004391", + "version": "1.0.0-rc3-004397", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 9f2d9a2e9..33909c415 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index f00cd0cc5..42fc221b4 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index f00cd0cc5..42fc221b4 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 6ebe7062a..3a88e49ac 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index fccc288ef..ad3e283c8 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index ac7312c9d..b95bcbabc 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004397" } }, "net451": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index 5fb6d1b78..87eb143cf 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004391"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004391-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004397"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004397-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/src/compilers/project.json b/src/compilers/project.json index f672a3961..4c45153f7 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160602-01", "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160602-01", diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 422361e04..f4413d51d 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index f0b52d4d3..09273ed4d 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index 423f06268..54e4bc2a2 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index acc16a70d..064b7146f 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -43,7 +43,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24201-00", "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24201-00", diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 6611df052..a6868a86d 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.ProjectModel": { diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 17ca93d24..e420acfe9 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index c790f1b1c..033d8f835 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.ProjectModel": { diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index 0cdb2225e..1fc8031aa 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index f82c42597..c6183ab81 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,7 +16,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24201-00", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index a23541719..1eb5482e0 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index e5ccc089c..0789bd58b 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.ProjectModel": { diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 72ea3925f..6a7379b1e 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24201-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Performance/project.json b/test/Performance/project.json index 0fe20f6b6..afc2b47c6 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.ProjectModel": { diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index b2cd4a4e3..558faa106 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index 3aca242d5..a29b3502b 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index 855a03212..efd64b8fc 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index cf0c9c2c3..7dd777998 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index a896e4e03..e06dd4074 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index 5787e532e..2f8273d75 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 003f7873c..f6b175aae 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index af57778a5..c604139b2 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index d939186b8..ca27fa4a7 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index e7b8a8d77..f76fb4deb 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "System.IO.Compression.ZipFile": "4.0.1-rc3-24201-00", diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index a8c124616..82f957ed7 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "dotnet": { "target": "project" diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 109982b5c..5d0542776 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.TestFramework": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 8079cd28c..a66348771 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 0cdb2225e..1fc8031aa 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index 419f5f50d..e748a6293 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "dotnet": { diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index dec44f0df..e0a07a403 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Newtonsoft.Json": "7.0.1", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 594a2dc87..8dd597b75 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "Newtonsoft.Json": "7.0.1", "dotnet": { diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index bc3d00f53..aa86444ec 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004397" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index dfaa36cc7..ed1263c84 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004391", + "Microsoft.NETCore.App": "1.0.0-rc3-004397", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From ea8ae8d1c70aa44bad62f58a4712667863a14dc2 Mon Sep 17 00:00:00 2001 From: eerhardt Date: Sat, 4 Jun 2016 18:32:34 +0000 Subject: [PATCH 03/97] Updating CoreFx, CoreSetup to rc3-24204-00, rc3-004400 respectively --- .../project.json | 2 +- .../DesktopAppWithNativeDep/project.json | 2 +- .../DesktopAppWithRuntimes/project.json | 2 +- .../KestrelDesktop/project.json | 2 +- .../KestrelDesktopForce32/project.json | 2 +- .../KestrelDesktopWithRuntimes/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../src/EmptyConsoleApp/project.json | 2 +- .../src/EmptyLibrary/project.json | 2 +- .../src/EmptyNetCoreApp/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../IncompatiblePackageSample/project.json | 2 +- .../src/Project1/project.json | 2 +- .../ToolWithOutputName/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../dotnet-desktop-and-portable/project.json | 2 +- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-portable/project.json | 2 +- .../TestApp1/project.json | 2 +- .../TestApp2/project.json | 2 +- .../AppWithBomGlobalJson/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithDirectDependency/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithOutputAssemblyName/project.json | 2 +- .../AppWithToolDependency/project.json | 2 +- .../TestProjects/CompileFail/project.json | 2 +- .../PortableApp_Standalone/project.json | 2 +- .../DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestAppDeps/project.json | 2 +- .../TestAppFullClr/project.json | 2 +- .../TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestProjects/EndToEndTestApp/project.json | 2 +- .../CompileFailApp/project.json | 2 +- .../FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../KestrelPortable/project.json | 2 +- .../KestrelStandalone/project.json | 2 +- .../project.json | 2 +- .../OutputStandardOutputAndError/project.json | 2 +- .../SingleTargetApp/project.json | 2 +- .../SingleTargetP0/project.json | 2 +- .../SingleTargetP1/project.json | 2 +- .../SingleTargetP2/project.json | 2 +- .../TwoTargetApp/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP0/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP1/project.json | 4 ++-- .../TwoTargetGraph/TwoTargetP2/project.json | 4 ++-- .../TwoTargetLargeP0/project.json | 6 +++--- .../TwoTargetLargeP1/project.json | 4 ++-- .../TwoTargetLargeP2/project.json | 4 ++-- .../TwoTargetLargeP3/project.json | 4 ++-- .../TwoTargetLargeP4/project.json | 4 ++-- .../TwoTargetLargeP5/project.json | 4 ++-- .../TwoTargetLargeP6/project.json | 4 ++-- .../PortableTests/PortableApp/project.json | 2 +- .../project.json | 2 +- .../PortableAppWithNative/project.json | 2 +- .../PortableTests/StandaloneApp/project.json | 2 +- .../MultipleFrameworkProject/project.json | 8 ++++---- .../NetCoreAppOnlyProject/project.json | 6 +++--- .../ResourcesTests/TestApp/project.json | 2 +- .../TestLibraryWithResources/project.json | 2 +- .../TestAppMultiTarget/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestProjects/TestAppSimple/project.json | 2 +- .../TestProjects/TestAppWithArgs/project.json | 2 +- .../App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestAppWithContentPackage/project.json | 2 +- .../TestAppWithContents/project.json | 2 +- .../TestAppWithLibrary/TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestAppWithResourceDeps/project.json | 12 +++++------ .../TestAppWithScripts/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../TestAppWithUnicodéPath/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../TestLibraryWithConfiguration/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../TestLibraryWithXmlDoc/project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 4 ++-- .../project.json | 6 +++--- .../TestMscorlibReference/project.json | 2 +- .../project.json | 2 +- .../src/L0/project.json | 2 +- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../project.json | 2 +- .../TestProjectWithResource/project.json | 2 +- .../TestLibraryWithRuleSet/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 2 +- .../TestSystemCoreReference/project.json | 2 +- .../TestSystemReference/project.json | 2 +- .../project.json | 6 +++--- .../dotnet-cli-build/CliDependencyVersions.cs | 4 ++-- build_projects/dotnet-cli-build/project.json | 14 ++++++------- .../DependencyVersions.cs | 2 +- .../shared-build-targets-utils/project.json | 12 +++++------ .../update-dependencies/project.json | 8 ++++---- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 6 +++--- .../project.json | 4 ++-- src/compilers/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- .../CSharp_Console/project.json.template | 2 +- .../FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 20 +++++++++---------- test/ArgumentForwardingTests/project.json | 4 ++-- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 4 ++-- test/Kestrel.Tests/project.json | 4 ++-- .../project.json | 6 +++--- .../project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- test/Performance/project.json | 4 ++-- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 4 ++-- .../project.json | 6 +++--- .../TestAppWithFullPdbs/project.json | 2 +- .../TestAppWithPortablePdbs/project.json | 2 +- test/binding-redirects.Tests/project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 4 ++-- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 4 ++-- test/dotnet-compile.UnitTests/project.json | 4 ++-- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 6 +++--- .../project.json | 6 +++--- test/dotnet-publish.Tests/project.json | 6 +++--- test/dotnet-resgen.Tests/project.json | 4 ++-- test/dotnet-run.Tests/project.json | 4 ++-- test/dotnet-run.UnitTests/project.json | 4 ++-- test/dotnet-test.Tests/project.json | 8 ++++---- test/dotnet-test.UnitTests/project.json | 4 ++-- test/dotnet.Tests/project.json | 4 ++-- tools/MultiProjectValidator/project.json | 2 +- 164 files changed, 263 insertions(+), 263 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index df556c0d8..def5383b3 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } }, "imports": [ diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json index 3c68e68e7..425a3236c 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "PackageWithFakeNativeDep": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json index aaf7ea898..caa62efdd 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc3-24201-00" + "Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc3-24204-00" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json index 534b7b815..a010933d4 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json index 618f1e566..d11e76b4e 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00" }, "buildOptions": { "platform": "anycpu32bitpreferred", diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json index 1a2987a4b..60c07c66b 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json index 2e5c52de9..db6444c2e 100644 --- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json @@ -9,7 +9,7 @@ "frameworks": { "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "imports": [ "portable-net45+win8", diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 42fab0517..a6a5ba865 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index a485d6e85..37500a5cc 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397", + "Microsoft.NETCore.App": "1.0.0-rc3-004400", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index f05e3a06e..a732a3696 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 66d732150..5b5ef8ff8 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json @@ -5,7 +5,7 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index a407c1ff1..dc9d96176 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index 13ae22720..578aa914b 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 3d57ebc08..3b872c751 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397", + "Microsoft.NETCore.App": "1.0.0-rc3-004400", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index 93d964750..b6d661648 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index 627ea0c89..d5f4d1991 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index c07601bad..c63ccc3d0 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index 679e988d2..e8c28dffe 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index 9d9b77e0b..0fdb54188 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index b3c473baf..05b7edfba 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index 83e55530b..e99d0235c 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 560873362..74644b16d 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index e83820834..516c6b502 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index 468d3d2d8..75d035aba 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index 583af7029..0dd378057 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index 01233b101..a4ecf833e 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004397", + "version": "1.0.0-rc3-004400", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 6221b536a..357de6c01 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397", + "Microsoft.NETCore.App": "1.0.0-rc3-004400", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index b678565bf..58d29a62f 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397", + "Microsoft.NETCore.App": "1.0.0-rc3-004400", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index f3ce046bc..c1ec42983 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004397", + "version": "1.0.0-rc3-004400", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index e8d8055fe..624072ca2 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004397", + "version": "1.0.0-rc3-004400", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 383df0f15..cf0ff367d 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index ff4be1968..505eb19f0 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 42fc221b4..0698fa3e4 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index 468d3d2d8..75d035aba 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index 08a4e4bae..bff64c880 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 3e2409e52..14c11651a 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -9,7 +9,7 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" } }, "net451": {} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 6f1104fa8..48c732bd0 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397", + "Microsoft.NETCore.App": "1.0.0-rc3-004400", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index d511a6c23..9b539132f 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397", + "Microsoft.NETCore.App": "1.0.0-rc3-004400", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json index 5b9b5911a..5c5f177c5 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json @@ -7,7 +7,7 @@ "dependencies": { "DependencyContextValidator": "1.0.0-*", "System.Diagnostics.Process": { - "version": "4.1.0-rc3-24201-00", + "version": "4.1.0-rc3-24204-00", "type": "build" } }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index cb5df5715..7c958e97c 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index d5abb5d55..fd0e32f7c 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json index b8511a76f..cf01d5441 100644 --- a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json +++ b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json @@ -2,7 +2,7 @@ "version": "1.0.0", "dependencies": { "TestLibrary": "1.0.0", - "System.IO.Compression": "4.1.0-rc3-24201-00" + "System.IO.Compression": "4.1.0-rc3-24204-00" }, "frameworks": { "net461": {} diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index 59b6a1a7e..69daeb0f8 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index 795d16bfe..fc641a24c 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index c4cc97709..88c7ab521 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004397", + "Microsoft.NETCore.App": "1.0.0-rc3-004400", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 0c9d8c336..81f514bf7 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index 2acb10d29..096761102 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index 58d4fca16..400063977 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index 3cf1a5f9d..e9635e900 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index 287ab17f4..4535f4916 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -3,7 +3,7 @@ "outputName": "MyLibrary" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 42fc221b4..0698fa3e4 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index f1a119c2c..5b797b9de 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index f1d7814fb..c0e22f95a 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index 326d7888a..7c4869509 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 9a01c74cb..562847d28 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index f65bd7196..9d6370b99 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,14 +9,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24204-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 90090016d..8d4e5f89d 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24204-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index c504c5729..437799e3b 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index 462245d73..acf53e73a 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index b15d62d6e..9068e5557 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24204-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index b2203a9b9..e105c0d51 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index 7a151e5fa..0898517c6 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index ee323c536..c4ede73fa 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index 86a0a0bc8..3b404fa11 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index 462245d73..acf53e73a 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index 462245d73..acf53e73a 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index a77605ef7..633f32ca0 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index be1122e1a..a97f7ddab 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 7b01c345e..90d2bd2cb 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index 7c19586e6..fcb8c1ff9 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index 40463c2ad..a1e225b20 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00", "xunit": "2.1.0" }, "frameworks": { @@ -15,10 +15,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Linq.Expressions": "4.1.0-rc3-24201-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00" + "System.Linq.Expressions": "4.1.0-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00" } }, "net451": {} diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index cf2fca841..5ff99311b 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Linq.Expressions": "4.1.0-rc3-24201-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Linq.Expressions": "4.1.0-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index 582efdfd2..14658a19f 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json index 2811884f5..507e1f0da 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index b91b8ba26..9cba28f4b 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004397", + "version": "1.0.0-rc3-004400", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index 26e0cd7db..974232318 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index 4db9e476b..5a957fc7a 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index 42fc221b4..0698fa3e4 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 42fc221b4..0698fa3e4 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index d3b109988..b5c69569f 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index 134c4ca52..cce88eb32 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index 1cf499313..1515e0618 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397", + "Microsoft.NETCore.App": "1.0.0-rc3-004400", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 62406b34f..0a652e3fc 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 238397eba..841ae55f7 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index 4db9e476b..5a957fc7a 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index 31276657e..c5860fb9d 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,12 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397", - "Microsoft.CSharp": "4.0.1-rc3-24201-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24201-00", - "System.Reflection.Metadata": "1.3.0-rc3-24201-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-24201-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004400", + "Microsoft.CSharp": "4.0.1-rc3-24204-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24204-00", + "System.Reflection.Metadata": "1.3.0-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24204-00", "WindowsAzure.Storage": "6.2.2-preview" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 754b3ce78..297990fb3 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index abc3bc56b..a8b1fb710 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 4c04f0eed..0ed7d626b 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 528c6c6f5..49d6a912e 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json @@ -8,7 +8,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index dd135028b..ba8042142 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json @@ -5,7 +5,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index 42fc221b4..0698fa3e4 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 238397eba..841ae55f7 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index d7a4a1beb..6d35a3b7a 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -7,7 +7,7 @@ "net451": {}, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 4a3436909..1c0315bd9 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index ae7da5238..91ac0c11a 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00", + "NETStandard.Library": "1.6.0-rc3-24204-00", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index a8e93f129..5c90b6daa 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json index 32f2e8ef0..f498a6e9a 100644 --- a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json +++ b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json @@ -5,7 +5,7 @@ }, "packInclude": {}, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index aac9cb13f..fea8cd050 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json @@ -28,7 +28,7 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json index 8bb43f362..1152a2ed8 100644 --- a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json +++ b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json @@ -4,7 +4,7 @@ "xmlDoc": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index efc497482..cf0adc649 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,12 +5,12 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" } }, "net451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24201-00" + "Microsoft.CSharp": "4.0.1-rc3-24204-00" } } }, diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index 3bfda0844..73682fcc1 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,17 +5,17 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" } }, "netcore50": { "dependencies": { - "System.Private.Uri": "4.0.1-rc3-24201-00" + "System.Private.Uri": "4.0.1-rc3-24204-00" } }, "net99": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24201-00" + "Microsoft.CSharp": "4.0.1-rc3-24204-00" } } }, diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 3e9984022..9134582aa 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index 10ae61f21..d41b9f21f 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004397", + "version": "1.0.0-rc3-004400", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 33909c415..0abe14096 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index e3a91edfe..e1ca8c56b 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -3,7 +3,7 @@ "dependencies": { "L12": "1.0.0-*", "L21": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index b47370eb2..f11e114da 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 2811884f5..507e1f0da 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 2811884f5..507e1f0da 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 42fc221b4..0698fa3e4 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 42fc221b4..0698fa3e4 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json index 559314522..06c7210a2 100644 --- a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json +++ b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json @@ -6,7 +6,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00", + "NETStandard.Library": "1.6.0-rc3-24204-00", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 3a88e49ac..c900be5ec 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index ad3e283c8..c3a416afd 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index b95bcbabc..e837e3266 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397" + "Microsoft.NETCore.App": "1.0.0-rc3-004400" } }, "net451": { diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json index b046f3793..b984aa26f 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -10,9 +10,9 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00", - "System.Diagnostics.Process": "4.1.0-rc3-24201-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00", + "System.Diagnostics.Process": "4.1.0-rc3-24204-00", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index 87eb143cf..b74719303 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004397"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004397-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004400"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004400-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index db3eb2774..bb17fa452 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -5,13 +5,13 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24201-00", - "Microsoft.CSharp": "4.0.1-rc3-24201-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24201-00", - "System.Reflection.Metadata": "1.3.0-rc3-24201-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-24201-00", + "NETStandard.Library": "1.6.0-rc3-24204-00", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24204-00", + "Microsoft.CSharp": "4.0.1-rc3-24204-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24204-00", + "System.Reflection.Metadata": "1.3.0-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24204-00", "WindowsAzure.Storage": "6.2.2-preview", "NuGet.CommandLine.XPlat": "3.5.0-rc-1285", "Microsoft.DotNet.Cli.Build.Framework": { diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 9da914807..d3a916376 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,6 +7,6 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "1.0.2-rc3-24201-00"; + public static readonly string CoreCLRVersion = "1.0.2-rc3-24204-00"; } } diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json index 2ea1ac22d..4aa87c468 100644 --- a/build_projects/shared-build-targets-utils/project.json +++ b/build_projects/shared-build-targets-utils/project.json @@ -2,12 +2,12 @@ "version": "1.0.0-*", "description": "Build scripts for dotnet-cli", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00", - "Microsoft.CSharp": "4.0.1-rc3-24201-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24201-00", - "System.Reflection.Metadata": "1.3.0-rc3-24201-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-24201-00", + "NETStandard.Library": "1.6.0-rc3-24204-00", + "Microsoft.CSharp": "4.0.1-rc3-24204-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24204-00", + "System.Reflection.Metadata": "1.3.0-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24204-00", "WindowsAzure.Storage": "6.2.2-preview", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 0fce7a1d8..52f9ab13c 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -5,10 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00", - "Microsoft.CSharp": "4.0.1-rc3-24201-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24201-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "NETStandard.Library": "1.6.0-rc3-24204-00", + "Microsoft.CSharp": "4.0.1-rc3-24204-00", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 52d31f8c6..b579ef57d 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -26,7 +26,7 @@ "portable-net45+wp80+win8+wpa81+dnxcore50" ], "dependencies": { - "System.Diagnostics.Process": "4.1.0-rc3-24201-00" + "System.Diagnostics.Process": "4.1.0-rc3-24204-00" } } } diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index f23ec79f9..09af2c36e 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Linq.Expressions": "4.1.0-rc3-24201-00" + "System.Linq.Expressions": "4.1.0-rc3-24204-00" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index 0c5631cd1..955c10cdb 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -10,14 +10,14 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.AppContext": "4.1.0-rc3-24201-00", - "System.Collections": "4.0.11-rc3-24201-00", - "System.IO": "4.1.0-rc3-24201-00", - "System.IO.FileSystem": "4.0.1-rc3-24201-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24201-00", - "System.Runtime.Extensions": "4.1.0-rc3-24201-00", - "System.Runtime.InteropServices": "4.1.0-rc3-24201-00", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24201-00" + "System.AppContext": "4.1.0-rc3-24204-00", + "System.Collections": "4.0.11-rc3-24204-00", + "System.IO": "4.1.0-rc3-24204-00", + "System.IO.FileSystem": "4.0.1-rc3-24204-00", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24204-00", + "System.Runtime.Extensions": "4.1.0-rc3-24204-00", + "System.Runtime.InteropServices": "4.1.0-rc3-24204-00", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24204-00" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 3cc471cb8..a11357029 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -7,7 +7,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Runtime.Loader": "4.0.0-rc3-24201-00" + "System.Runtime.Loader": "4.0.0-rc3-24204-00" }, "frameworks": { "netstandard1.6": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 9b5d43b29..369705375 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -11,7 +11,7 @@ "Newtonsoft.Json": "7.0.1", "NuGet.Packaging": "3.5.0-rc-1285", "NuGet.RuntimeModel": "3.5.0-rc-1285", - "System.Reflection.Metadata": "1.3.0-rc3-24201-00" + "System.Reflection.Metadata": "1.3.0-rc3-24204-00" }, "frameworks": { "net451": { @@ -33,13 +33,13 @@ "dotnet5.4" ], "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24201-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24201-00", - "System.Runtime.Loader": "4.0.0-rc3-24201-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", - "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24201-00", - "System.Threading.Thread": "4.0.0-rc3-24201-00", - "System.Xml.XDocument": "4.0.11-rc3-24201-00" + "Microsoft.CSharp": "4.0.1-rc3-24204-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24204-00", + "System.Runtime.Loader": "4.0.0-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24204-00", + "System.Threading.Thread": "4.0.0-rc3-24204-00", + "System.Xml.XDocument": "4.0.11-rc3-24204-00" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 40dbd1003..ec4439e90 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -16,9 +16,9 @@ "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { - "System.Diagnostics.Debug": "4.0.11-rc3-24201-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24201-00", - "System.Linq": "4.1.0-rc3-24201-00" + "System.Diagnostics.Debug": "4.0.11-rc3-24204-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24204-00", + "System.Linq": "4.1.0-rc3-24204-00" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index a2789570e..201ea7267 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -22,8 +22,8 @@ "portable-net45+win8" ], "dependencies": { - "System.Resources.ResourceManager": "4.0.1-rc3-24201-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24201-00" + "System.Resources.ResourceManager": "4.0.1-rc3-24204-00", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24204-00" } } }, diff --git a/src/compilers/project.json b/src/compilers/project.json index 4c45153f7..70ddf7204 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160602-01", "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160602-01", diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index f4413d51d..36356fc79 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index 09273ed4d..e9ae97bd1 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index 54e4bc2a2..c66d3f79f 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 064b7146f..efa9a5e4a 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -26,8 +26,8 @@ }, "NuGet.CommandLine.XPlat": "3.5.0-rc-1285", "Newtonsoft.Json": "7.0.1", - "System.Text.Encoding.CodePages": "4.0.1-rc3-24201-00", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24201-00", + "System.Text.Encoding.CodePages": "4.0.1-rc3-24204-00", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24204-00", "Microsoft.ApplicationInsights": "2.0.0", "Microsoft.DotNet.ProjectModel": { "target": "project" @@ -43,16 +43,16 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24201-00", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24201-00", - "System.Resources.Writer": "4.0.0-rc3-24201-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", - "System.Private.DataContractSerialization": "4.1.1-rc3-24201-00", - "System.Text.RegularExpressions": "4.1.0-rc3-24201-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24204-00", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24204-00", + "System.Resources.Writer": "4.0.0-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Private.DataContractSerialization": "4.1.1-rc3-24204-00", + "System.Text.RegularExpressions": "4.1.0-rc3-24204-00", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24201-00", + "version": "4.0.0-rc3-24204-00", "exclude": "compile" } }, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index a6868a86d..60a57817c 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index e420acfe9..cc3435cc8 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 033d8f835..015b42cb7 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index 1fc8031aa..6216ba2d4 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index c6183ab81..b0e900c36 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,10 +16,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24201-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "NuGet.Versioning": "3.5.0-rc-1285", "NuGet.Packaging": "3.5.0-rc-1285", "NuGet.Frameworks": "3.5.0-rc-1285", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 1eb5482e0..adadcf08a 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 0789bd58b..4c5ee3449 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,9 +11,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 6a7379b1e..6879d2ca7 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,9 +7,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24201-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24204-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Performance/project.json b/test/Performance/project.json index afc2b47c6..c12f671ef 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 558faa106..7d87f7bc5 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index a29b3502b..3e921534c 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,12 +3,12 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index efd64b8fc..e2e1c698a 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,13 +3,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", - "System.Diagnostics.Process": "4.1.0-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Diagnostics.Process": "4.1.0-rc3-24204-00", "TestAppWithPortablePdbs": { "target": "project" }, diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index de246a370..69c8213e0 100644 --- a/test/TestingAbstractions/TestAppWithFullPdbs/project.json +++ b/test/TestingAbstractions/TestAppWithFullPdbs/project.json @@ -4,7 +4,7 @@ "debugType": "full" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": {} diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index 0eb05161a..7704ffee5 100644 --- a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json +++ b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24204-00" }, "frameworks": { "netstandard1.5": {} diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json index c3a9439a6..8cd1a6f2f 100644 --- a/test/binding-redirects.Tests/project.json +++ b/test/binding-redirects.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" } diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index 7dd777998..87d7f4123 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index e06dd4074..364780e7a 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index 2f8273d75..57c0e47ce 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index f6b175aae..7db98c0fb 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index c604139b2..1f159af10 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -23,7 +23,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24201-00", + "version": "4.0.0-rc3-24204-00", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index ca27fa4a7..bed26e154 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index f76fb4deb..1c24e8d3b 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", - "System.IO.Compression.ZipFile": "4.0.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.IO.Compression.ZipFile": "4.0.1-rc3-24204-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 82f957ed7..7ca93bcd0 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,13 +2,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24201-00", + "version": "4.0.0-rc3-24204-00", "exclude": "Compile" }, "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -19,7 +19,7 @@ }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Net.NameResolution": "4.0.0-rc3-24201-00" + "System.Net.NameResolution": "4.0.0-rc3-24204-00" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 5d0542776..d34bc3967 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.TestFramework": { "target": "project" }, @@ -15,7 +15,7 @@ "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00206", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24201-00" + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24204-00" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index a66348771..4268e3e1d 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 1fc8031aa..6216ba2d4 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index e748a6293..f5f43c7c5 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index e0a07a403..0cb9e14dd 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Newtonsoft.Json": "7.0.1", "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -15,9 +15,9 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc3-24201-00", - "System.Net.Sockets": "4.1.0-rc3-24201-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Net.NameResolution": "4.0.0-rc3-24204-00", + "System.Net.Sockets": "4.1.0-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 8dd597b75..b3fd42d1e 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,14 +3,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, "Newtonsoft.Json": "7.0.1", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24201-00", + "version": "4.0.0-rc3-24204-00", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index aa86444ec..f1f198176 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004397" + "version": "1.0.0-rc3-004400" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24201-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index ed1263c84..31c7a5cd3 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004397", + "Microsoft.NETCore.App": "1.0.0-rc3-004400", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From 3e77d1a2d8ad08c48991ff6b7bd8239826bf6e2f Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Sat, 4 Jun 2016 18:55:40 -0500 Subject: [PATCH 04/97] Moving TestAsset project from netstandard1.5 to 1.6. --- .../LibraryWithDirectDependencyDesktopAndPortable/project.json | 2 +- test/dotnet.Tests/PackagedCommandTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json index db6444c2e..80d3802c1 100644 --- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json @@ -7,7 +7,7 @@ "dotnet-desktop-and-portable": "1.0.0-*" }, "frameworks": { - "netstandard1.5": { + "netstandard1.6": { "dependencies": { "NETStandard.Library": "1.6.0-rc3-24204-00" }, diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs index c666b2e52..9dc045d10 100644 --- a/test/dotnet.Tests/PackagedCommandTests.cs +++ b/test/dotnet.Tests/PackagedCommandTests.cs @@ -40,7 +40,7 @@ namespace Microsoft.DotNet.Tests var projectOutputPath = $"LibraryWithDirectDependencyDesktopAndPortable\\bin\\Debug\\net451\\dotnet-desktop-and-portable.exe"; return new[] { - new object[] { ".NETStandard,Version=v1.5", "CoreFX", "lib\\netstandard1.5\\dotnet-desktop-and-portable.dll", true }, + new object[] { ".NETStandard,Version=v1.6", "CoreFX", "lib\\netstandard1.6\\dotnet-desktop-and-portable.dll", true }, new object[] { ".NETFramework,Version=v4.5.1", "NetFX", projectOutputPath, true } }; } From 7adf70d297dc171fef345fbb201212f15bb662a4 Mon Sep 17 00:00:00 2001 From: Troy Dai Date: Sun, 5 Jun 2016 20:30:21 -0700 Subject: [PATCH 05/97] Expand timeout setting for project model server --- test/dotnet-projectmodel-server.Tests/DthTestClient.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/dotnet-projectmodel-server.Tests/DthTestClient.cs b/test/dotnet-projectmodel-server.Tests/DthTestClient.cs index f7d230fe0..6df404ac4 100644 --- a/test/dotnet-projectmodel-server.Tests/DthTestClient.cs +++ b/test/dotnet-projectmodel-server.Tests/DthTestClient.cs @@ -22,6 +22,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests private readonly NetworkStream _networkStream; private readonly BlockingCollection _messageQueue; private readonly CancellationTokenSource _readCancellationToken; + private readonly TimeSpan _defaultTimeout = TimeSpan.FromSeconds(20); // Keeps track of initialized project contexts // REVIEW: This needs to be exposed if we ever create 2 clients in order to simulate how build @@ -129,7 +130,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests var result = new List(); while (count > 0) { - result.Add(GetResponse(timeout: TimeSpan.FromSeconds(10))); + result.Add(GetResponse(timeout: _defaultTimeout)); count--; } @@ -138,7 +139,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests public List DrainAllMessages() { - return DrainAllMessages(TimeSpan.FromSeconds(10)); + return DrainAllMessages(_defaultTimeout); } /// @@ -173,7 +174,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests /// The first match message public DthMessage DrainTillFirst(string type) { - return DrainTillFirst(type, TimeSpan.FromSeconds(10)); + return DrainTillFirst(type, _defaultTimeout); } /// From 354b1d38d5d93971417e07ac9cd79fe7df1df859 Mon Sep 17 00:00:00 2001 From: eerhardt Date: Mon, 6 Jun 2016 14:24:51 +0000 Subject: [PATCH 06/97] Updating CoreFx, CoreSetup to rc3-24206-00, rc3-004404 respectively --- .../project.json | 2 +- .../DesktopAppWithNativeDep/project.json | 2 +- .../DesktopAppWithRuntimes/project.json | 2 +- .../KestrelDesktop/project.json | 2 +- .../KestrelDesktopForce32/project.json | 2 +- .../KestrelDesktopWithRuntimes/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../src/EmptyConsoleApp/project.json | 2 +- .../src/EmptyLibrary/project.json | 2 +- .../src/EmptyNetCoreApp/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../IncompatiblePackageSample/project.json | 2 +- .../src/Project1/project.json | 2 +- .../ToolWithOutputName/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../dotnet-desktop-and-portable/project.json | 2 +- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-portable/project.json | 2 +- .../TestApp1/project.json | 2 +- .../TestApp2/project.json | 2 +- .../AppWithBomGlobalJson/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithDirectDependency/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithOutputAssemblyName/project.json | 2 +- .../AppWithToolDependency/project.json | 2 +- .../TestProjects/CompileFail/project.json | 2 +- .../PortableApp_Standalone/project.json | 2 +- .../DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestAppDeps/project.json | 2 +- .../TestAppFullClr/project.json | 2 +- .../TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestProjects/EndToEndTestApp/project.json | 2 +- .../CompileFailApp/project.json | 2 +- .../FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../KestrelPortable/project.json | 2 +- .../KestrelStandalone/project.json | 2 +- .../project.json | 2 +- .../OutputStandardOutputAndError/project.json | 2 +- .../SingleTargetApp/project.json | 2 +- .../SingleTargetP0/project.json | 2 +- .../SingleTargetP1/project.json | 2 +- .../SingleTargetP2/project.json | 2 +- .../TwoTargetApp/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP0/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP1/project.json | 4 ++-- .../TwoTargetGraph/TwoTargetP2/project.json | 4 ++-- .../TwoTargetLargeP0/project.json | 6 +++--- .../TwoTargetLargeP1/project.json | 4 ++-- .../TwoTargetLargeP2/project.json | 4 ++-- .../TwoTargetLargeP3/project.json | 4 ++-- .../TwoTargetLargeP4/project.json | 4 ++-- .../TwoTargetLargeP5/project.json | 4 ++-- .../TwoTargetLargeP6/project.json | 4 ++-- .../PortableTests/PortableApp/project.json | 2 +- .../project.json | 2 +- .../PortableAppWithNative/project.json | 2 +- .../PortableTests/StandaloneApp/project.json | 2 +- .../MultipleFrameworkProject/project.json | 8 ++++---- .../NetCoreAppOnlyProject/project.json | 6 +++--- .../ResourcesTests/TestApp/project.json | 2 +- .../TestLibraryWithResources/project.json | 2 +- .../TestAppMultiTarget/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestProjects/TestAppSimple/project.json | 2 +- .../TestProjects/TestAppWithArgs/project.json | 2 +- .../App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestAppWithContentPackage/project.json | 2 +- .../TestAppWithContents/project.json | 2 +- .../TestAppWithLibrary/TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestAppWithResourceDeps/project.json | 12 +++++------ .../TestAppWithScripts/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../TestAppWithUnicodéPath/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../TestLibraryWithConfiguration/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../TestLibraryWithXmlDoc/project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 4 ++-- .../project.json | 6 +++--- .../TestMscorlibReference/project.json | 2 +- .../project.json | 2 +- .../src/L0/project.json | 2 +- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../project.json | 2 +- .../TestProjectWithResource/project.json | 2 +- .../TestLibraryWithRuleSet/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 2 +- .../TestSystemCoreReference/project.json | 2 +- .../TestSystemReference/project.json | 2 +- .../project.json | 6 +++--- .../dotnet-cli-build/CliDependencyVersions.cs | 4 ++-- build_projects/dotnet-cli-build/project.json | 14 ++++++------- .../DependencyVersions.cs | 2 +- .../shared-build-targets-utils/project.json | 12 +++++------ .../update-dependencies/project.json | 8 ++++---- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 6 +++--- .../project.json | 4 ++-- src/compilers/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- .../CSharp_Console/project.json.template | 2 +- .../FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 20 +++++++++---------- test/ArgumentForwardingTests/project.json | 4 ++-- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 4 ++-- test/Kestrel.Tests/project.json | 4 ++-- .../project.json | 6 +++--- .../project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- test/Performance/project.json | 4 ++-- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 4 ++-- .../project.json | 6 +++--- .../TestAppWithFullPdbs/project.json | 2 +- .../TestAppWithPortablePdbs/project.json | 2 +- test/binding-redirects.Tests/project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 4 ++-- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 4 ++-- test/dotnet-compile.UnitTests/project.json | 4 ++-- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 6 +++--- .../project.json | 6 +++--- test/dotnet-publish.Tests/project.json | 6 +++--- test/dotnet-resgen.Tests/project.json | 4 ++-- test/dotnet-run.Tests/project.json | 4 ++-- test/dotnet-run.UnitTests/project.json | 4 ++-- test/dotnet-test.Tests/project.json | 8 ++++---- test/dotnet-test.UnitTests/project.json | 4 ++-- test/dotnet.Tests/project.json | 4 ++-- tools/MultiProjectValidator/project.json | 2 +- 164 files changed, 263 insertions(+), 263 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index def5383b3..33e8f3f28 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } }, "imports": [ diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json index 425a3236c..dc57867fa 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "PackageWithFakeNativeDep": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24206-00" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json index caa62efdd..aca443945 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc3-24204-00" + "Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc3-24206-00" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json index a010933d4..c6360a360 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24206-00" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json index d11e76b4e..a9cf0bd3d 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24206-00" }, "buildOptions": { "platform": "anycpu32bitpreferred", diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json index 60c07c66b..c207dc345 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24206-00" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json index 80d3802c1..f56b83bdc 100644 --- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json @@ -9,7 +9,7 @@ "frameworks": { "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "imports": [ "portable-net45+win8", diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index a6a5ba865..37917ba00 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 37500a5cc..9017b31ba 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400", + "Microsoft.NETCore.App": "1.0.0-rc3-004404", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index a732a3696..339fe967d 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 5b5ef8ff8..813fc5ecc 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json @@ -5,7 +5,7 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index dc9d96176..a21ade06e 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index 578aa914b..52f7273ed 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 3b872c751..3b5fcec7c 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400", + "Microsoft.NETCore.App": "1.0.0-rc3-004404", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index b6d661648..3b8d29073 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index d5f4d1991..cc31fe0d8 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index c63ccc3d0..adad97068 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index e8c28dffe..53ce2abbd 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index 0fdb54188..d896d2358 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index 05b7edfba..e254f28b5 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index e99d0235c..acaea648b 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 74644b16d..14636cbce 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index 516c6b502..ebe54f72c 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index 75d035aba..72a7751ec 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index 0dd378057..428a1d1b2 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index a4ecf833e..8c57186a8 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004400", + "version": "1.0.0-rc3-004404", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 357de6c01..7c4a1c814 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400", + "Microsoft.NETCore.App": "1.0.0-rc3-004404", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index 58d29a62f..aa8a9f16f 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400", + "Microsoft.NETCore.App": "1.0.0-rc3-004404", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index c1ec42983..996766bae 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004400", + "version": "1.0.0-rc3-004404", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index 624072ca2..18cb96505 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004400", + "version": "1.0.0-rc3-004404", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index cf0ff367d..a4ae85a80 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 505eb19f0..cc174944f 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 0698fa3e4..c75decc0a 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index 75d035aba..72a7751ec 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index bff64c880..1bbb2dfd1 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 14c11651a..88e531a61 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -9,7 +9,7 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" } }, "net451": {} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 48c732bd0..c7701799a 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400", + "Microsoft.NETCore.App": "1.0.0-rc3-004404", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index 9b539132f..eee484bc6 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400", + "Microsoft.NETCore.App": "1.0.0-rc3-004404", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json index 5c5f177c5..28efeabce 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json @@ -7,7 +7,7 @@ "dependencies": { "DependencyContextValidator": "1.0.0-*", "System.Diagnostics.Process": { - "version": "4.1.0-rc3-24204-00", + "version": "4.1.0-rc3-24206-00", "type": "build" } }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 7c958e97c..fd28cd9e5 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index fd0e32f7c..3f9d7e82e 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json index cf01d5441..70398cb11 100644 --- a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json +++ b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json @@ -2,7 +2,7 @@ "version": "1.0.0", "dependencies": { "TestLibrary": "1.0.0", - "System.IO.Compression": "4.1.0-rc3-24204-00" + "System.IO.Compression": "4.1.0-rc3-24206-00" }, "frameworks": { "net461": {} diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index 69daeb0f8..a0bd07448 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index fc641a24c..864982edf 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index 88c7ab521..f616913e4 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004400", + "Microsoft.NETCore.App": "1.0.0-rc3-004404", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 81f514bf7..295683bc7 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index 096761102..be7c966b6 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index 400063977..b02bd8b44 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index e9635e900..6a2deaffa 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index 4535f4916..6bec4ccc9 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -3,7 +3,7 @@ "outputName": "MyLibrary" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 0698fa3e4..c75decc0a 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index 5b797b9de..bccec4e2a 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index c0e22f95a..a61fcf3f7 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index 7c4869509..296de9de7 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 562847d28..7f9f552d6 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index 9d6370b99..203e21906 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,14 +9,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24206-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 8d4e5f89d..48b531076 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24206-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index 437799e3b..613882eb5 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index acf53e73a..59cb898ff 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 9068e5557..a326d5363 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24206-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index e105c0d51..31bba80e1 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index 0898517c6..795dd3b45 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index c4ede73fa..37b9d71fa 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index 3b404fa11..0d5ceeab1 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index acf53e73a..59cb898ff 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index acf53e73a..59cb898ff 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index 633f32ca0..db838f1e3 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index a97f7ddab..4b0e59b8b 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 90d2bd2cb..6ade46276 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index fcb8c1ff9..d2343490c 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index a1e225b20..fce20dcfb 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24206-00", "xunit": "2.1.0" }, "frameworks": { @@ -15,10 +15,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Linq.Expressions": "4.1.0-rc3-24204-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00" + "System.Linq.Expressions": "4.1.0-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00" } }, "net451": {} diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index 5ff99311b..407d5ad9e 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Linq.Expressions": "4.1.0-rc3-24204-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Linq.Expressions": "4.1.0-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index 14658a19f..86162c6d9 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json index 507e1f0da..8985b2345 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 9cba28f4b..2650221b5 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004400", + "version": "1.0.0-rc3-004404", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index 974232318..791827a17 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index 5a957fc7a..3ec965e1a 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index 0698fa3e4..c75decc0a 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 0698fa3e4..c75decc0a 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index b5c69569f..21cf62add 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index cce88eb32..b3c905aa0 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index 1515e0618..1d1d540da 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400", + "Microsoft.NETCore.App": "1.0.0-rc3-004404", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 0a652e3fc..75390c7a6 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 841ae55f7..b9405efff 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index 5a957fc7a..3ec965e1a 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index c5860fb9d..20e11d28f 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,12 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400", - "Microsoft.CSharp": "4.0.1-rc3-24204-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24204-00", - "System.Reflection.Metadata": "1.3.0-rc3-24204-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-24204-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004404", + "Microsoft.CSharp": "4.0.1-rc3-24206-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24206-00", + "System.Reflection.Metadata": "1.3.0-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24206-00", "WindowsAzure.Storage": "6.2.2-preview" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 297990fb3..5bd446b2d 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index a8b1fb710..3bb81dd9a 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 0ed7d626b..8d2981cef 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 49d6a912e..248fb7e50 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json @@ -8,7 +8,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index ba8042142..28e5514e0 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json @@ -5,7 +5,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index 0698fa3e4..c75decc0a 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 841ae55f7..b9405efff 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 6d35a3b7a..b1cbf25d5 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -7,7 +7,7 @@ "net451": {}, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 1c0315bd9..66cf2f64c 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 91ac0c11a..e04c0aa42 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00", + "NETStandard.Library": "1.6.0-rc3-24206-00", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index 5c90b6daa..135db2068 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json index f498a6e9a..10fb85a8e 100644 --- a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json +++ b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json @@ -5,7 +5,7 @@ }, "packInclude": {}, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index fea8cd050..0dfd3501f 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json @@ -28,7 +28,7 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json index 1152a2ed8..72d61953b 100644 --- a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json +++ b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json @@ -4,7 +4,7 @@ "xmlDoc": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index cf0adc649..8644a4da2 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,12 +5,12 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" } }, "net451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24204-00" + "Microsoft.CSharp": "4.0.1-rc3-24206-00" } } }, diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index 73682fcc1..d179415e8 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,17 +5,17 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" } }, "netcore50": { "dependencies": { - "System.Private.Uri": "4.0.1-rc3-24204-00" + "System.Private.Uri": "4.0.1-rc3-24206-00" } }, "net99": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24204-00" + "Microsoft.CSharp": "4.0.1-rc3-24206-00" } } }, diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 9134582aa..10b026d34 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index d41b9f21f..e5fce977a 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004400", + "version": "1.0.0-rc3-004404", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 0abe14096..11652cfa0 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index e1ca8c56b..2e6d7a5d4 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -3,7 +3,7 @@ "dependencies": { "L12": "1.0.0-*", "L21": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index f11e114da..a17f56f12 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 507e1f0da..8985b2345 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 507e1f0da..8985b2345 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 0698fa3e4..c75decc0a 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 0698fa3e4..c75decc0a 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json index 06c7210a2..352a303c6 100644 --- a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json +++ b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json @@ -6,7 +6,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00", + "NETStandard.Library": "1.6.0-rc3-24206-00", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index c900be5ec..6b984448e 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index c3a416afd..472a73134 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index e837e3266..1504ff10b 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400" + "Microsoft.NETCore.App": "1.0.0-rc3-004404" } }, "net451": { diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json index b984aa26f..c3382944d 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -10,9 +10,9 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00", - "System.Diagnostics.Process": "4.1.0-rc3-24204-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00", + "System.Diagnostics.Process": "4.1.0-rc3-24206-00", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index b74719303..0fe0dada7 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004400"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004400-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004404"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004404-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index bb17fa452..3397dfc23 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -5,13 +5,13 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24204-00", - "Microsoft.CSharp": "4.0.1-rc3-24204-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24204-00", - "System.Reflection.Metadata": "1.3.0-rc3-24204-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-24204-00", + "NETStandard.Library": "1.6.0-rc3-24206-00", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24206-00", + "Microsoft.CSharp": "4.0.1-rc3-24206-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24206-00", + "System.Reflection.Metadata": "1.3.0-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24206-00", "WindowsAzure.Storage": "6.2.2-preview", "NuGet.CommandLine.XPlat": "3.5.0-rc-1285", "Microsoft.DotNet.Cli.Build.Framework": { diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index d3a916376..f37814580 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,6 +7,6 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "1.0.2-rc3-24204-00"; + public static readonly string CoreCLRVersion = "1.0.2-rc3-24206-00"; } } diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json index 4aa87c468..a9035853e 100644 --- a/build_projects/shared-build-targets-utils/project.json +++ b/build_projects/shared-build-targets-utils/project.json @@ -2,12 +2,12 @@ "version": "1.0.0-*", "description": "Build scripts for dotnet-cli", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00", - "Microsoft.CSharp": "4.0.1-rc3-24204-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24204-00", - "System.Reflection.Metadata": "1.3.0-rc3-24204-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-24204-00", + "NETStandard.Library": "1.6.0-rc3-24206-00", + "Microsoft.CSharp": "4.0.1-rc3-24206-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24206-00", + "System.Reflection.Metadata": "1.3.0-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24206-00", "WindowsAzure.Storage": "6.2.2-preview", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 52f9ab13c..1f99d0e35 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -5,10 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00", - "Microsoft.CSharp": "4.0.1-rc3-24204-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24204-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "NETStandard.Library": "1.6.0-rc3-24206-00", + "Microsoft.CSharp": "4.0.1-rc3-24206-00", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index b579ef57d..8fae6e53a 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -26,7 +26,7 @@ "portable-net45+wp80+win8+wpa81+dnxcore50" ], "dependencies": { - "System.Diagnostics.Process": "4.1.0-rc3-24204-00" + "System.Diagnostics.Process": "4.1.0-rc3-24206-00" } } } diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 09af2c36e..60b46ff3b 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Linq.Expressions": "4.1.0-rc3-24204-00" + "System.Linq.Expressions": "4.1.0-rc3-24206-00" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index 955c10cdb..d62158440 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -10,14 +10,14 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.AppContext": "4.1.0-rc3-24204-00", - "System.Collections": "4.0.11-rc3-24204-00", - "System.IO": "4.1.0-rc3-24204-00", - "System.IO.FileSystem": "4.0.1-rc3-24204-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24204-00", - "System.Runtime.Extensions": "4.1.0-rc3-24204-00", - "System.Runtime.InteropServices": "4.1.0-rc3-24204-00", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24204-00" + "System.AppContext": "4.1.0-rc3-24206-00", + "System.Collections": "4.0.11-rc3-24206-00", + "System.IO": "4.1.0-rc3-24206-00", + "System.IO.FileSystem": "4.0.1-rc3-24206-00", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24206-00", + "System.Runtime.Extensions": "4.1.0-rc3-24206-00", + "System.Runtime.InteropServices": "4.1.0-rc3-24206-00", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24206-00" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index a11357029..174795b36 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -7,7 +7,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Runtime.Loader": "4.0.0-rc3-24204-00" + "System.Runtime.Loader": "4.0.0-rc3-24206-00" }, "frameworks": { "netstandard1.6": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 369705375..ef66371b5 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -11,7 +11,7 @@ "Newtonsoft.Json": "7.0.1", "NuGet.Packaging": "3.5.0-rc-1285", "NuGet.RuntimeModel": "3.5.0-rc-1285", - "System.Reflection.Metadata": "1.3.0-rc3-24204-00" + "System.Reflection.Metadata": "1.3.0-rc3-24206-00" }, "frameworks": { "net451": { @@ -33,13 +33,13 @@ "dotnet5.4" ], "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24204-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24204-00", - "System.Runtime.Loader": "4.0.0-rc3-24204-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", - "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24204-00", - "System.Threading.Thread": "4.0.0-rc3-24204-00", - "System.Xml.XDocument": "4.0.11-rc3-24204-00" + "Microsoft.CSharp": "4.0.1-rc3-24206-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24206-00", + "System.Runtime.Loader": "4.0.0-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24206-00", + "System.Threading.Thread": "4.0.0-rc3-24206-00", + "System.Xml.XDocument": "4.0.11-rc3-24206-00" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index ec4439e90..3d16170ee 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -16,9 +16,9 @@ "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { - "System.Diagnostics.Debug": "4.0.11-rc3-24204-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24204-00", - "System.Linq": "4.1.0-rc3-24204-00" + "System.Diagnostics.Debug": "4.0.11-rc3-24206-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24206-00", + "System.Linq": "4.1.0-rc3-24206-00" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 201ea7267..53b2fa058 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -22,8 +22,8 @@ "portable-net45+win8" ], "dependencies": { - "System.Resources.ResourceManager": "4.0.1-rc3-24204-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24204-00" + "System.Resources.ResourceManager": "4.0.1-rc3-24206-00", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24206-00" } } }, diff --git a/src/compilers/project.json b/src/compilers/project.json index 70ddf7204..944a5cced 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160602-01", "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160602-01", diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 36356fc79..3aa542087 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index e9ae97bd1..de0839367 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index c66d3f79f..80aa8fe18 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index efa9a5e4a..ae9e7a0d6 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -26,8 +26,8 @@ }, "NuGet.CommandLine.XPlat": "3.5.0-rc-1285", "Newtonsoft.Json": "7.0.1", - "System.Text.Encoding.CodePages": "4.0.1-rc3-24204-00", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24204-00", + "System.Text.Encoding.CodePages": "4.0.1-rc3-24206-00", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24206-00", "Microsoft.ApplicationInsights": "2.0.0", "Microsoft.DotNet.ProjectModel": { "target": "project" @@ -43,16 +43,16 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24204-00", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24204-00", - "System.Resources.Writer": "4.0.0-rc3-24204-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", - "System.Private.DataContractSerialization": "4.1.1-rc3-24204-00", - "System.Text.RegularExpressions": "4.1.0-rc3-24204-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24206-00", + "System.Resources.Writer": "4.0.0-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Private.DataContractSerialization": "4.1.1-rc3-24206-00", + "System.Text.RegularExpressions": "4.1.0-rc3-24206-00", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24204-00", + "version": "4.0.0-rc3-24206-00", "exclude": "compile" } }, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 60a57817c..799b4ab39 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index cc3435cc8..573a43a9e 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 015b42cb7..b3e1a890c 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index 6216ba2d4..7b7c15c0c 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index b0e900c36..0fd334bb4 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,10 +16,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24204-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "NuGet.Versioning": "3.5.0-rc-1285", "NuGet.Packaging": "3.5.0-rc-1285", "NuGet.Frameworks": "3.5.0-rc-1285", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index adadcf08a..7b19af92e 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 4c5ee3449..86f1f313d 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,9 +11,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 6879d2ca7..a6f0cb48e 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,9 +7,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24204-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Performance/project.json b/test/Performance/project.json index c12f671ef..b740069e2 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 7d87f7bc5..03b605cd1 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index 3e921534c..6b0692d19 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,12 +3,12 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index e2e1c698a..351775bfa 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,13 +3,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", - "System.Diagnostics.Process": "4.1.0-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Diagnostics.Process": "4.1.0-rc3-24206-00", "TestAppWithPortablePdbs": { "target": "project" }, diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index 69c8213e0..d1080f730 100644 --- a/test/TestingAbstractions/TestAppWithFullPdbs/project.json +++ b/test/TestingAbstractions/TestAppWithFullPdbs/project.json @@ -4,7 +4,7 @@ "debugType": "full" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": {} diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index 7704ffee5..645a24729 100644 --- a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json +++ b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24204-00" + "NETStandard.Library": "1.6.0-rc3-24206-00" }, "frameworks": { "netstandard1.5": {} diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json index 8cd1a6f2f..d5743a9cc 100644 --- a/test/binding-redirects.Tests/project.json +++ b/test/binding-redirects.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" } diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index 87d7f4123..dfe29d5e2 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 364780e7a..ccd953343 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index 57c0e47ce..76bdb9985 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 7db98c0fb..f91e1063f 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 1f159af10..6bf764d5b 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -23,7 +23,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24204-00", + "version": "4.0.0-rc3-24206-00", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index bed26e154..6940bb04d 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 1c24e8d3b..fce92cd9a 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", - "System.IO.Compression.ZipFile": "4.0.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.IO.Compression.ZipFile": "4.0.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 7ca93bcd0..52cee2bf6 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,13 +2,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24204-00", + "version": "4.0.0-rc3-24206-00", "exclude": "Compile" }, "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -19,7 +19,7 @@ }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Net.NameResolution": "4.0.0-rc3-24204-00" + "System.Net.NameResolution": "4.0.0-rc3-24206-00" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index d34bc3967..06cbf4f3c 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.TestFramework": { "target": "project" }, @@ -15,7 +15,7 @@ "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00206", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24204-00" + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24206-00" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 4268e3e1d..cb7476d4d 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 6216ba2d4..7b7c15c0c 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index f5f43c7c5..9a5173a22 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 0cb9e14dd..7c07ac87c 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Newtonsoft.Json": "7.0.1", "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -15,9 +15,9 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc3-24204-00", - "System.Net.Sockets": "4.1.0-rc3-24204-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Net.NameResolution": "4.0.0-rc3-24206-00", + "System.Net.Sockets": "4.1.0-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index b3fd42d1e..25d6db1f3 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,14 +3,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, "Newtonsoft.Json": "7.0.1", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24204-00", + "version": "4.0.0-rc3-24206-00", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index f1f198176..b2af8f28e 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004400" + "version": "1.0.0-rc3-004404" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24204-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 31c7a5cd3..915600440 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004400", + "Microsoft.NETCore.App": "1.0.0-rc3-004404", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From d76807d22a946c2d12c117bdf5471efb3ade4b74 Mon Sep 17 00:00:00 2001 From: Luke Latham Date: Mon, 6 Jun 2016 09:35:24 -0500 Subject: [PATCH 07/97] Change 'got' to 'received' for dep conflicts --- .../Resolution/LibraryManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs index f20feaa35..6cbf9c021 100644 --- a/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs +++ b/src/Microsoft.DotNet.ProjectModel/Resolution/LibraryManager.cs @@ -172,7 +172,7 @@ namespace Microsoft.DotNet.ProjectModel.Resolution if (item.Library != library && !versionRange.Satisfies(library.Identity.Version)) { - var message = $"Dependency conflict. {item.Library.Identity} expected {FormatLibraryRange(item.Dependency)} but got {library.Identity.Version}"; + var message = $"Dependency conflict. {item.Library.Identity} expected {FormatLibraryRange(item.Dependency)} but received {library.Identity.Version}"; messages.Add( new DiagnosticMessage( @@ -272,4 +272,4 @@ namespace Microsoft.DotNet.ProjectModel.Resolution } } } -} \ No newline at end of file +} From f34788898d58cb6efdb2c2ce8898f6423b31e802 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 6 Jun 2016 10:31:44 -0500 Subject: [PATCH 08/97] Pass env into ExecCore --- .../Microsoft.DotNet.Cli.Build.Framework/BuildHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/BuildHelpers.cs b/build_projects/Microsoft.DotNet.Cli.Build.Framework/BuildHelpers.cs index 85b71bf4b..8a6a5e4d8 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/BuildHelpers.cs +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/BuildHelpers.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build.Framework public static int ExecSilent(string command, params string[] args) => ExecSilent(command, (IEnumerable)args); public static int ExecSilent(string command, IEnumerable args) => ExecSilent(command, args, env: null); - public static int ExecSilent(string command, IEnumerable args, IDictionary env) => ExecCore(command, args, workingDirectory: null, silent: true, env: null); + public static int ExecSilent(string command, IEnumerable args, IDictionary env) => ExecCore(command, args, workingDirectory: null, silent: true, env: env); public static int Exec(string command, params string[] args) => Exec(command, (IEnumerable)args); public static int Exec(string command, IEnumerable args) => ExecCore(command, args, workingDirectory: null, silent: false, env: null); From 42938f180fcede673347fca2419d734625216051 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 6 Jun 2016 11:15:07 -0500 Subject: [PATCH 09/97] Updating CoreSetup to rc3-004406 --- .../AppWithDirectDependencyDesktopAndPortable/project.json | 2 +- .../TestProjectWithUnresolvedDependency/project.json | 2 +- .../DthTestProjects/src/BrokenProjectPathSample/project.json | 2 +- .../DthTestProjects/src/EmptyConsoleApp/project.json | 2 +- .../DthTestProjects/src/EmptyNetCoreApp/project.json | 2 +- .../DthTestProjects/src/FailReleaseProject/project.json | 2 +- .../src/IncompatiblePackageSample/project.json | 2 +- .../IncorrectGlobalJson/src/Project1/project.json | 2 +- TestAssets/TestPackages/ToolWithOutputName/project.json | 2 +- .../TestPackages/dotnet-dependency-context-test/project.json | 2 +- .../TestPackages/dotnet-dependency-tool-invoker/project.json | 2 +- .../TestPackages/dotnet-desktop-and-portable/project.json | 2 +- .../TestPackages/dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-hello/v2/dotnet-hello/project.json | 2 +- TestAssets/TestPackages/dotnet-portable/project.json | 2 +- .../TestProjects/AppWithAppDependency/TestApp1/project.json | 2 +- .../TestProjects/AppWithAppDependency/TestApp2/project.json | 2 +- TestAssets/TestProjects/AppWithBomGlobalJson/project.json | 2 +- .../AppWithDependencyOnToolWithOutputName/project.json | 2 +- .../TestProjects/AppWithDirectAndToolDependency/project.json | 2 +- TestAssets/TestProjects/AppWithDirectDependency/project.json | 2 +- .../AppWithDirectDependencyAndTypeBuild/project.json | 2 +- .../AppWithDirectDependencyWithOutputName/project.json | 2 +- .../TestProjects/AppWithOutputAssemblyName/project.json | 2 +- TestAssets/TestProjects/AppWithToolDependency/project.json | 2 +- TestAssets/TestProjects/CompileFail/project.json | 2 +- .../DependencyChangeTest/PortableApp_Standalone/project.json | 2 +- .../TestProjects/DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/TestApp/project.json | 2 +- .../DependencyContextValidator/TestAppDeps/project.json | 2 +- .../DependencyContextValidator/TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- TestAssets/TestProjects/EndToEndTestApp/project.json | 2 +- .../FSharpTestProjects/CompileFailApp/project.json | 2 +- .../TestProjects/FSharpTestProjects/TestApp/project.json | 2 +- .../FSharpTestProjects/TestAppWithArgs/project.json | 2 +- .../TestProjects/KestrelSample/KestrelPortable/project.json | 2 +- .../TestProjects/KestrelSample/KestrelStandalone/project.json | 2 +- .../TestProjects/OutputStandardOutputAndError/project.json | 2 +- .../PerformanceTestProjects/SingleTargetApp/project.json | 2 +- .../SingleTargetGraph/SingleTargetP0/project.json | 2 +- .../SingleTargetGraph/SingleTargetP1/project.json | 2 +- .../SingleTargetGraph/SingleTargetP2/project.json | 2 +- .../PerformanceTestProjects/TwoTargetApp/project.json | 2 +- .../TwoTargetGraph/TwoTargetP0/project.json | 2 +- .../TwoTargetGraph/TwoTargetP1/project.json | 2 +- .../TwoTargetGraph/TwoTargetP2/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP0/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP1/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP2/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP3/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP4/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP5/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP6/project.json | 2 +- .../TestProjects/PortableTests/PortableApp/project.json | 2 +- .../PortableTests/PortableAppCompilationContext/project.json | 2 +- .../PortableTests/PortableAppWithNative/project.json | 2 +- .../TestProjects/PortableTests/StandaloneApp/project.json | 2 +- .../ProjectsWithTests/MultipleFrameworkProject/project.json | 2 +- .../ProjectsWithTests/NetCoreAppOnlyProject/project.json | 2 +- TestAssets/TestProjects/ResourcesTests/TestApp/project.json | 2 +- .../TestProjects/RunTestsApps/TestAppMultiTarget/project.json | 2 +- .../TestAppCompilationContext/TestApp/project.json | 2 +- TestAssets/TestProjects/TestAppSimple/project.json | 2 +- TestAssets/TestProjects/TestAppWithArgs/project.json | 2 +- .../TestProjects/TestAppWithBuildDependency/App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestProjects/TestAppWithContentPackage/project.json | 2 +- TestAssets/TestProjects/TestAppWithContents/project.json | 2 +- .../TestProjects/TestAppWithLibrary/TestApp/project.json | 2 +- TestAssets/TestProjects/TestAppWithResourceDeps/project.json | 2 +- TestAssets/TestProjects/TestAppWithScripts/project.json | 2 +- .../TestAppWithTransitiveAppDependency/TestApp/project.json | 2 +- TestAssets/TestProjects/TestAppWithUnicodéPath/project.json | 2 +- .../TestAppWithWrapperProjectDependency/TestApp/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestProjects/TestMicrosoftCSharpReference/project.json | 2 +- .../TestMicrosoftCSharpReferenceMissingFramework/project.json | 2 +- TestAssets/TestProjects/TestMscorlibReference/project.json | 2 +- .../TestProjectContextBuildAllDedupe/project.json | 2 +- .../TestProjectToProjectDependencies/src/L0/project.json | 2 +- .../TestProjectWithCultureSpecificResource/project.json | 2 +- TestAssets/TestProjects/TestProjectWithResource/project.json | 2 +- TestAssets/TestProjects/TestSimpleIncrementalApp/project.json | 2 +- TestAssets/TestProjects/TestSystemCoreReference/project.json | 2 +- TestAssets/TestProjects/TestSystemReference/project.json | 2 +- build_projects/dotnet-cli-build/CliDependencyVersions.cs | 4 ++-- src/compilers/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- .../commands/dotnet-new/CSharp_Console/project.json.template | 2 +- .../commands/dotnet-new/FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 2 +- test/ArgumentForwardingTests/project.json | 2 +- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 2 +- test/Kestrel.Tests/project.json | 2 +- test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 2 +- test/Microsoft.DotNet.Compiler.Common.Tests/project.json | 2 +- test/Microsoft.DotNet.ProjectModel.Tests/project.json | 2 +- test/Microsoft.Extensions.DependencyModel.Tests/project.json | 2 +- test/Performance/project.json | 2 +- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 2 +- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 2 +- test/dotnet-compile.UnitTests/project.json | 2 +- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 2 +- test/dotnet-projectmodel-server.Tests/project.json | 2 +- test/dotnet-publish.Tests/project.json | 2 +- test/dotnet-resgen.Tests/project.json | 2 +- test/dotnet-run.Tests/project.json | 2 +- test/dotnet-run.UnitTests/project.json | 2 +- test/dotnet-test.Tests/project.json | 2 +- test/dotnet-test.UnitTests/project.json | 2 +- test/dotnet.Tests/project.json | 2 +- tools/MultiProjectValidator/project.json | 2 +- 120 files changed, 121 insertions(+), 121 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index 33e8f3f28..67aef28b4 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } }, "imports": [ diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 37917ba00..d14f8c25a 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 9017b31ba..f82906b12 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404", + "Microsoft.NETCore.App": "1.0.0-rc3-004406", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index 339fe967d..984bdc82c 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index a21ade06e..e9611cac8 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index 52f7273ed..50bfe42ac 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 3b5fcec7c..374f7b6dc 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404", + "Microsoft.NETCore.App": "1.0.0-rc3-004406", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index 3b8d29073..2f55fa62b 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index cc31fe0d8..8245f890d 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index adad97068..8e3e6360a 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index 53ce2abbd..cbd1e8faf 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index d896d2358..9ceaf7bc7 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index e254f28b5..5a515b2dd 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index acaea648b..0e5e16e97 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 14636cbce..92dc57b18 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index ebe54f72c..51a5dd04c 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index 72a7751ec..4470621fc 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index 428a1d1b2..c1aa52328 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index 8c57186a8..189a4ac3e 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004404", + "version": "1.0.0-rc3-004406", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 7c4a1c814..6075151ff 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404", + "Microsoft.NETCore.App": "1.0.0-rc3-004406", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index aa8a9f16f..f20e58840 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404", + "Microsoft.NETCore.App": "1.0.0-rc3-004406", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index 996766bae..721336663 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004404", + "version": "1.0.0-rc3-004406", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index 18cb96505..3ae9d4c50 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004404", + "version": "1.0.0-rc3-004406", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index a4ae85a80..94a5923a4 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index cc174944f..0307ee0d7 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index c75decc0a..826349526 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index 72a7751ec..4470621fc 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index 1bbb2dfd1..d233f6f00 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index c7701799a..5ad6cb402 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404", + "Microsoft.NETCore.App": "1.0.0-rc3-004406", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index eee484bc6..175eda783 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404", + "Microsoft.NETCore.App": "1.0.0-rc3-004406", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index fd28cd9e5..0e2a97ffd 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index 3f9d7e82e..d116d85e7 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index a0bd07448..1d298b0ba 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index 864982edf..050a74bbe 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index f616913e4..858fdf500 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004404", + "Microsoft.NETCore.App": "1.0.0-rc3-004406", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 295683bc7..e980d0af9 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index b02bd8b44..e3be1a7c1 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index 6a2deaffa..b44fc5fa4 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index c75decc0a..826349526 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index bccec4e2a..16040c371 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index a61fcf3f7..6f67139b2 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index 296de9de7..6f72143fe 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 7f9f552d6..f8fc5aa46 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index 203e21906..1219e6d15 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 48b531076..595e645a4 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index 613882eb5..9f8a1ecf1 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index 59cb898ff..35ecf9e6e 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index a326d5363..13592a639 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index 31bba80e1..6a4b29d27 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index 795dd3b45..db76c80de 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index 37b9d71fa..499b2dde7 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index 0d5ceeab1..ff0bab982 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index 59cb898ff..35ecf9e6e 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index 59cb898ff..35ecf9e6e 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index db838f1e3..c5569c8e6 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index 4b0e59b8b..ab369e316 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 6ade46276..d40997530 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index d2343490c..4c5e57527 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index fce20dcfb..c92259434 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -15,7 +15,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Linq.Expressions": "4.1.0-rc3-24206-00", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00" diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index 407d5ad9e..bd7aeb582 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Linq.Expressions": "4.1.0-rc3-24206-00", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index 86162c6d9..6ba3a72e9 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 2650221b5..9d5fee815 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004404", + "version": "1.0.0-rc3-004406", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index 791827a17..c2d0ea3e7 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index c75decc0a..826349526 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index c75decc0a..826349526 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index 21cf62add..c8bf82c96 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index b3c905aa0..754925663 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index 1d1d540da..8e0251fb8 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404", + "Microsoft.NETCore.App": "1.0.0-rc3-004406", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 75390c7a6..d0f39f263 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index b9405efff..b40375f67 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index 20e11d28f..ad2b53c92 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404", + "Microsoft.NETCore.App": "1.0.0-rc3-004406", "Microsoft.CSharp": "4.0.1-rc3-24206-00", "System.Dynamic.Runtime": "4.0.11-rc3-24206-00", "System.Reflection.Metadata": "1.3.0-rc3-24206-00", diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 5bd446b2d..ea85e3ac1 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index 3bb81dd9a..9b95b573c 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index c75decc0a..826349526 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index b9405efff..b40375f67 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 66cf2f64c..e42f06a2c 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 8644a4da2..69d920014 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,7 +5,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" } }, "net451": { diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index d179415e8..99eb75c2d 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,7 +5,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" } }, "netcore50": { diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 10b026d34..5d58e6933 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index e5fce977a..2d5db6365 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004404", + "version": "1.0.0-rc3-004406", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 11652cfa0..b867d9b96 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index c75decc0a..826349526 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index c75decc0a..826349526 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 6b984448e..e54230da9 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index 472a73134..bdbe6f7f1 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index 1504ff10b..fd849d6d7 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404" + "Microsoft.NETCore.App": "1.0.0-rc3-004406" } }, "net451": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index 0fe0dada7..61d5d59e9 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004404"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004404-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004406"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004406-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/src/compilers/project.json b/src/compilers/project.json index 944a5cced..e81427d69 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160602-01", "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160602-01", diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 3aa542087..6e0b86b9e 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index de0839367..268d395f2 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index 80aa8fe18..ebe665195 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index ae9e7a0d6..d182d9107 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -43,7 +43,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24206-00", diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 799b4ab39..41e3f1afb 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.ProjectModel": { diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 573a43a9e..323ec5798 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index b3e1a890c..a5ffda87d 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.ProjectModel": { diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index 7b7c15c0c..e1cd2fd67 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 0fd334bb4..04cb5e797 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,7 +16,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 7b19af92e..7f02dcc1d 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 86f1f313d..c578cd592 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.ProjectModel": { diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index a6f0cb48e..386a06ac2 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Performance/project.json b/test/Performance/project.json index b740069e2..ff5228920 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.ProjectModel": { diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 03b605cd1..3fa92a3b0 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index 6b0692d19..9eb4da9ff 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index 351775bfa..4b65c3188 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index dfe29d5e2..00d620fd9 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index ccd953343..20a4e252c 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index 76bdb9985..dcec07300 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index f91e1063f..6bfcba132 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 6bf764d5b..fdfc1d684 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index 6940bb04d..4a0a6cfd0 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index fce92cd9a..5054a5031 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "System.IO.Compression.ZipFile": "4.0.1-rc3-24206-00", diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 52cee2bf6..391de2b0f 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "dotnet": { "target": "project" diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 06cbf4f3c..4e80cd5f9 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.TestFramework": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index cb7476d4d..2a7e61c84 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 7b7c15c0c..e1cd2fd67 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index 9a5173a22..24ae0e881 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "dotnet": { diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 7c07ac87c..fa4aea2f4 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Newtonsoft.Json": "7.0.1", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 25d6db1f3..82a3e3b84 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "Newtonsoft.Json": "7.0.1", "dotnet": { diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index b2af8f28e..300328d2b 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004404" + "version": "1.0.0-rc3-004406" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 915600440..feab49f6b 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004404", + "Microsoft.NETCore.App": "1.0.0-rc3-004406", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From 8099e6b9f7308484a33b629d7e9e157e0ba489e1 Mon Sep 17 00:00:00 2001 From: Todd Moscinski Date: Fri, 3 Jun 2016 14:53:58 -0700 Subject: [PATCH 10/97] Adding support for --serviceable option to pack command which puts true into the output nuspec --- src/Microsoft.DotNet.ProjectModel/Project.cs | 2 ++ src/dotnet/commands/dotnet-pack/NuGet/Manifest.cs | 1 + src/dotnet/commands/dotnet-pack/NuGet/ManifestMetadata.cs | 2 ++ src/dotnet/commands/dotnet-pack/NuGet/ManifestReader.cs | 3 +++ .../commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs | 8 +++++++- .../commands/dotnet-pack/NuGet/ManifestVersionUtility.cs | 8 +++++++- src/dotnet/commands/dotnet-pack/NuGet/PackageBuilder.cs | 7 +++++++ .../dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs | 4 ++++ src/dotnet/commands/dotnet-pack/PackageGenerator.cs | 1 + src/dotnet/commands/dotnet-pack/Program.cs | 3 +++ 10 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.DotNet.ProjectModel/Project.cs b/src/Microsoft.DotNet.ProjectModel/Project.cs index 737206c40..3aba2a6ac 100644 --- a/src/Microsoft.DotNet.ProjectModel/Project.cs +++ b/src/Microsoft.DotNet.ProjectModel/Project.cs @@ -68,6 +68,8 @@ namespace Microsoft.DotNet.ProjectModel public PackOptions PackOptions { get; set; } + public bool Serviceable { get; set; } + public RuntimeOptions RuntimeOptions { get; set; } public IDictionary Commands { get; } = new Dictionary(StringComparer.OrdinalIgnoreCase); diff --git a/src/dotnet/commands/dotnet-pack/NuGet/Manifest.cs b/src/dotnet/commands/dotnet-pack/NuGet/Manifest.cs index 330add22e..e400f5c55 100644 --- a/src/dotnet/commands/dotnet-pack/NuGet/Manifest.cs +++ b/src/dotnet/commands/dotnet-pack/NuGet/Manifest.cs @@ -109,6 +109,7 @@ namespace NuGet metadata.Authors = copy.Authors.Distinct(); metadata.Owners = copy.Owners.Distinct(); metadata.Tags = string.Join(",", copy.Tags).Trim(); + metadata.Serviceable = copy.Serviceable; metadata.LicenseUrl = copy.LicenseUrl; metadata.ProjectUrl = copy.ProjectUrl; metadata.IconUrl = copy.IconUrl; diff --git a/src/dotnet/commands/dotnet-pack/NuGet/ManifestMetadata.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestMetadata.cs index 59fcdefd4..1010c8140 100644 --- a/src/dotnet/commands/dotnet-pack/NuGet/ManifestMetadata.cs +++ b/src/dotnet/commands/dotnet-pack/NuGet/ManifestMetadata.cs @@ -77,6 +77,8 @@ namespace NuGet public string Tags { get; set; } + public bool Serviceable { get; set; } + public IEnumerable DependencySets { get; set; } = new List(); public ICollection PackageAssemblyReferences { get; set; } = new List(); diff --git a/src/dotnet/commands/dotnet-pack/NuGet/ManifestReader.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestReader.cs index a8196a62b..d3a81b680 100644 --- a/src/dotnet/commands/dotnet-pack/NuGet/ManifestReader.cs +++ b/src/dotnet/commands/dotnet-pack/NuGet/ManifestReader.cs @@ -130,6 +130,9 @@ namespace NuGet case "tags": manifestMetadata.Tags = value; break; + case "serviceable": + manifestMetadata.Serviceable = XmlConvert.ToBoolean(value); + break; case "dependencies": manifestMetadata.DependencySets = ReadDependencySets(element); break; diff --git a/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs index defcd12cc..510aad70a 100644 --- a/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs +++ b/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs @@ -41,13 +41,19 @@ namespace NuGet /// internal const string SchemaVersionV6 = "http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd"; + /// + /// Added serviceble element under metadata. + /// + internal const string SchemaVersionV7 = "http://schemas.microsoft.com/packaging/2016/06/nuspec.xsd"; + private static readonly string[] VersionToSchemaMappings = new[] { SchemaVersionV1, SchemaVersionV2, SchemaVersionV3, SchemaVersionV4, SchemaVersionV5, - SchemaVersionV6 + SchemaVersionV6, + SchemaVersionV7 }; public static int GetVersionFromNamespace(string @namespace) diff --git a/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs index c549a48ea..e3e841cbc 100644 --- a/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs +++ b/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs @@ -15,6 +15,7 @@ namespace NuGet public const int TargetFrameworkSupportForDependencyContentsAndToolsVersion = 4; public const int TargetFrameworkSupportForReferencesVersion = 5; public const int XdtTransformationVersion = 6; + public const int ServiceableVersion = 7; public static int GetManifestVersion(ManifestMetadata metadata) { @@ -23,7 +24,12 @@ namespace NuGet private static int GetMaxVersionFromMetadata(ManifestMetadata metadata) { - // Important: check for version 5 before version 4 + // Important: always add newer version checks at the top + if (metadata.Serviceable) + { + return ServiceableVersion; + } + bool referencesHasTargetFramework = metadata.PackageAssemblyReferences != null && metadata.PackageAssemblyReferences.Any(r => r.TargetFramework != null); diff --git a/src/dotnet/commands/dotnet-pack/NuGet/PackageBuilder.cs b/src/dotnet/commands/dotnet-pack/NuGet/PackageBuilder.cs index 8a8c99282..f6596df79 100644 --- a/src/dotnet/commands/dotnet-pack/NuGet/PackageBuilder.cs +++ b/src/dotnet/commands/dotnet-pack/NuGet/PackageBuilder.cs @@ -87,6 +87,12 @@ namespace NuGet set; } + public bool Serviceable + { + get; + set; + } + public bool DevelopmentDependency { get; @@ -284,6 +290,7 @@ namespace NuGet ProjectUrl = manifestMetadata.ProjectUrl; RequireLicenseAcceptance = manifestMetadata.RequireLicenseAcceptance; DevelopmentDependency = manifestMetadata.DevelopmentDependency; + Serviceable = manifestMetadata.Serviceable; Description = manifestMetadata.Description; Summary = manifestMetadata.Summary; ReleaseNotes = manifestMetadata.ReleaseNotes; diff --git a/src/dotnet/commands/dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs b/src/dotnet/commands/dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs index 3d25de307..c654dd5ec 100644 --- a/src/dotnet/commands/dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs +++ b/src/dotnet/commands/dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs @@ -51,6 +51,10 @@ namespace NuGet AddElementIfNotNull(elem, ns, "copyright", metadata.Copyright); AddElementIfNotNull(elem, ns, "language", metadata.Language); AddElementIfNotNull(elem, ns, "tags", metadata.Tags); + if (metadata.Serviceable) + { + elem.Add(new XElement(ns + "serviceable", metadata.Serviceable)); + } elem.Add(GetXElementFromGroupableItemSets( ns, diff --git a/src/dotnet/commands/dotnet-pack/PackageGenerator.cs b/src/dotnet/commands/dotnet-pack/PackageGenerator.cs index 4b4f891aa..1997b95ec 100644 --- a/src/dotnet/commands/dotnet-pack/PackageGenerator.cs +++ b/src/dotnet/commands/dotnet-pack/PackageGenerator.cs @@ -390,6 +390,7 @@ namespace Microsoft.DotNet.Tools.Compiler builder.ReleaseNotes = project.PackOptions.ReleaseNotes; builder.Language = project.Language; builder.Tags.AddRange(project.PackOptions.Tags); + builder.Serviceable = project.Serviceable; if (!string.IsNullOrEmpty(project.PackOptions.IconUrl)) { diff --git a/src/dotnet/commands/dotnet-pack/Program.cs b/src/dotnet/commands/dotnet-pack/Program.cs index 0c89edea9..352e8bd01 100644 --- a/src/dotnet/commands/dotnet-pack/Program.cs +++ b/src/dotnet/commands/dotnet-pack/Program.cs @@ -29,6 +29,7 @@ namespace Microsoft.DotNet.Tools.Compiler var buildBasePath = app.Option("-b|--build-base-path ", "Directory in which to place temporary build outputs", CommandOptionType.SingleValue); var configuration = app.Option("-c|--configuration ", "Configuration under which to build", CommandOptionType.SingleValue); var versionSuffix = app.Option("--version-suffix ", "Defines what `*` should be replaced with in version field in project.json", CommandOptionType.SingleValue); + var serviceable = app.Option("-s|--serviceable", "Set the serviceable flag in the output nuspec", CommandOptionType.NoValue); var path = app.Argument("", "The project to compile, defaults to the current directory. Can be a path to a project.json or a project directory"); app.OnExecute(() => @@ -64,6 +65,8 @@ namespace Microsoft.DotNet.Tools.Compiler var artifactPathsCalculator = new ArtifactPathsCalculator(project, buildBasePathValue, outputValue, configValue); var packageBuilder = new PackagesGenerator(contexts, artifactPathsCalculator, configValue); + project.Serviceable = serviceable.HasValue(); + int buildResult = 0; if (!noBuild.HasValue()) { From 391675c5b91690c40abc9555f33de4f0bc366953 Mon Sep 17 00:00:00 2001 From: Todd Moscinski Date: Fri, 3 Jun 2016 15:46:16 -0700 Subject: [PATCH 11/97] Changing schema version to 8 to match NuGet internal value and adding a pack test for the --serviceable option. --- .../NuGet/ManifestSchemaUtility.cs | 4 +-- .../NuGet/ManifestVersionUtility.cs | 2 +- .../Commands/PackCommand.cs | 17 ++++++++-- test/dotnet-pack.Tests/PackTests.cs | 31 +++++++++++++++++++ 4 files changed, 49 insertions(+), 5 deletions(-) diff --git a/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs index 510aad70a..f839f8c19 100644 --- a/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs +++ b/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs @@ -44,7 +44,7 @@ namespace NuGet /// /// Added serviceble element under metadata. /// - internal const string SchemaVersionV7 = "http://schemas.microsoft.com/packaging/2016/06/nuspec.xsd"; + internal const string SchemaVersionV8 = "http://schemas.microsoft.com/packaging/2016/06/nuspec.xsd"; private static readonly string[] VersionToSchemaMappings = new[] { SchemaVersionV1, @@ -53,7 +53,7 @@ namespace NuGet SchemaVersionV4, SchemaVersionV5, SchemaVersionV6, - SchemaVersionV7 + SchemaVersionV8 }; public static int GetVersionFromNamespace(string @namespace) diff --git a/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs index e3e841cbc..6c1a719e8 100644 --- a/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs +++ b/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs @@ -15,7 +15,7 @@ namespace NuGet public const int TargetFrameworkSupportForDependencyContentsAndToolsVersion = 4; public const int TargetFrameworkSupportForReferencesVersion = 5; public const int XdtTransformationVersion = 6; - public const int ServiceableVersion = 7; + public const int ServiceableVersion = 8; public static int GetManifestVersion(ManifestMetadata metadata) { diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PackCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PackCommand.cs index ffedf3f0a..54cff340d 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PackCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PackCommand.cs @@ -14,6 +14,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities private string _tempOutputDirectory; private string _configuration; private string _versionSuffix; + private string _serviceable; private string OutputOption { @@ -64,13 +65,24 @@ namespace Microsoft.DotNet.Tools.Test.Utilities } } + private string ServiceableOption + { + get + { + return _serviceable == string.Empty ? + "" : + $"--serviceable"; + } + } + public PackCommand( string projectPath, string output = "", string buildBasePath = "", string tempOutput="", string configuration="", - string versionSuffix="") + string versionSuffix="", + string serviceable = "") : base("dotnet") { _projectPath = projectPath; @@ -79,6 +91,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities _tempOutputDirectory = tempOutput; _configuration = configuration; _versionSuffix = versionSuffix; + _serviceable = serviceable; } public override CommandResult Execute(string args = "") @@ -89,7 +102,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities private string BuildArgs() { - return $"{_projectPath} {OutputOption} {BuildBasePathOption} {TempOutputOption} {ConfigurationOption} {VersionSuffixOption}"; + return $"{_projectPath} {OutputOption} {BuildBasePathOption} {TempOutputOption} {ConfigurationOption} {VersionSuffixOption} {ServiceableOption}"; } } } diff --git a/test/dotnet-pack.Tests/PackTests.cs b/test/dotnet-pack.Tests/PackTests.cs index 7613ed159..ed4d35224 100644 --- a/test/dotnet-pack.Tests/PackTests.cs +++ b/test/dotnet-pack.Tests/PackTests.cs @@ -4,6 +4,8 @@ using System; using System.IO; using System.IO.Compression; +using System.Linq; +using System.Xml.Linq; using FluentAssertions; using Microsoft.DotNet.ProjectModel; using Microsoft.DotNet.Tools.Test.Utilities; @@ -150,6 +152,35 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests .Pass(); } + [Fact] + public void HasServiceableFlagWhenArgumentPassed() + { + var root = Temp.CreateDirectory(); + + var testLibDir = root.CreateDirectory("TestLibrary"); + var sourceTestLibDir = Path.Combine(_testProjectsRoot, "TestLibraryWithConfiguration"); + + CopyProjectToTempDir(sourceTestLibDir, testLibDir); + + var testProject = GetProjectPath(testLibDir); + var packCommand = new PackCommand(testProject, configuration: "Debug", serviceable: "true"); + var result = packCommand.Execute(); + result.Should().Pass(); + + var outputDir = new DirectoryInfo(Path.Combine(testLibDir.Path, "bin", "Debug")); + outputDir.Should().Exist(); + outputDir.Should().HaveFiles(new[] { "TestLibrary.1.0.0.nupkg", "TestLibrary.1.0.0.symbols.nupkg" }); + + var outputPackage = Path.Combine(outputDir.FullName, "TestLibrary.1.0.0.nupkg"); + var zip = ZipFile.Open(outputPackage, ZipArchiveMode.Read); + zip.Entries.Should().Contain(e => e.FullName == "TestLibrary.nuspec"); + + var manifestReader = new StreamReader(zip.Entries.First(e => e.FullName == "TestLibrary.nuspec").Open()); + var nuspecXml = XDocument.Parse(manifestReader.ReadToEnd()); + var node = nuspecXml.Descendants().Single(e => e.Name.LocalName == "serviceable"); + Assert.Equal("true", node.Value); + } + private void CopyProjectToTempDir(string projectDir, TempDirectory tempDir) { // copy all the files to temp dir From d3b935489f5ce357bd815243a347f06e8bd5f26c Mon Sep 17 00:00:00 2001 From: Todd Moscinski Date: Sun, 5 Jun 2016 11:52:41 -0700 Subject: [PATCH 12/97] Fixing schema version number, tweaking a string, and making test call pass a bool instead of a string to enable serviceable. --- .../dotnet-pack/NuGet/ManifestVersionUtility.cs | 4 +++- src/dotnet/commands/dotnet-pack/Program.cs | 2 +- .../Commands/PackCommand.cs | 10 +++++----- test/dotnet-pack.Tests/PackTests.cs | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs index 6c1a719e8..ce4665153 100644 --- a/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs +++ b/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs @@ -15,7 +15,9 @@ namespace NuGet public const int TargetFrameworkSupportForDependencyContentsAndToolsVersion = 4; public const int TargetFrameworkSupportForReferencesVersion = 5; public const int XdtTransformationVersion = 6; - public const int ServiceableVersion = 8; + // Note that this version should change from 7 to 8 when the PackageType + // schema is merged into here + public const int ServiceableVersion = 7; public static int GetManifestVersion(ManifestMetadata metadata) { diff --git a/src/dotnet/commands/dotnet-pack/Program.cs b/src/dotnet/commands/dotnet-pack/Program.cs index 352e8bd01..0d167ec2b 100644 --- a/src/dotnet/commands/dotnet-pack/Program.cs +++ b/src/dotnet/commands/dotnet-pack/Program.cs @@ -29,7 +29,7 @@ namespace Microsoft.DotNet.Tools.Compiler var buildBasePath = app.Option("-b|--build-base-path ", "Directory in which to place temporary build outputs", CommandOptionType.SingleValue); var configuration = app.Option("-c|--configuration ", "Configuration under which to build", CommandOptionType.SingleValue); var versionSuffix = app.Option("--version-suffix ", "Defines what `*` should be replaced with in version field in project.json", CommandOptionType.SingleValue); - var serviceable = app.Option("-s|--serviceable", "Set the serviceable flag in the output nuspec", CommandOptionType.NoValue); + var serviceable = app.Option("-s|--serviceable", "Set the serviceable flag in the package", CommandOptionType.NoValue); var path = app.Argument("", "The project to compile, defaults to the current directory. Can be a path to a project.json or a project directory"); app.OnExecute(() => diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PackCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PackCommand.cs index 54cff340d..de3adae6c 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PackCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PackCommand.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities private string _tempOutputDirectory; private string _configuration; private string _versionSuffix; - private string _serviceable; + private bool _serviceable; private string OutputOption { @@ -69,9 +69,9 @@ namespace Microsoft.DotNet.Tools.Test.Utilities { get { - return _serviceable == string.Empty ? - "" : - $"--serviceable"; + return _serviceable ? + $"--serviceable" : + ""; } } @@ -82,7 +82,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities string tempOutput="", string configuration="", string versionSuffix="", - string serviceable = "") + bool serviceable = false) : base("dotnet") { _projectPath = projectPath; diff --git a/test/dotnet-pack.Tests/PackTests.cs b/test/dotnet-pack.Tests/PackTests.cs index ed4d35224..5091e7fd7 100644 --- a/test/dotnet-pack.Tests/PackTests.cs +++ b/test/dotnet-pack.Tests/PackTests.cs @@ -163,7 +163,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests CopyProjectToTempDir(sourceTestLibDir, testLibDir); var testProject = GetProjectPath(testLibDir); - var packCommand = new PackCommand(testProject, configuration: "Debug", serviceable: "true"); + var packCommand = new PackCommand(testProject, configuration: "Debug", serviceable: true); var result = packCommand.Execute(); result.Should().Pass(); From 5378f5a697931054c66adfbdb04a6383a06b0cd0 Mon Sep 17 00:00:00 2001 From: Rohit Agrawal Date: Mon, 6 Jun 2016 14:14:20 -0700 Subject: [PATCH 13/97] update nuget to 3.5.0-beta2-1392 --- build_projects/dotnet-cli-build/project.json | 2 +- build_projects/update-dependencies/project.json | 2 +- src/Microsoft.DotNet.Cli.Utils/project.json | 8 ++++---- src/Microsoft.DotNet.ProjectModel/project.json | 4 ++-- src/dotnet/project.json | 4 ++-- test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 3397dfc23..4870103e1 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -13,7 +13,7 @@ "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "System.Xml.XmlSerializer": "4.0.11-rc3-24206-00", "WindowsAzure.Storage": "6.2.2-preview", - "NuGet.CommandLine.XPlat": "3.5.0-rc-1285", + "NuGet.CommandLine.XPlat": "3.5.0-beta2-1392", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 1f99d0e35..2622595e7 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, - "NuGet.Versioning": "3.5.0-rc-1285", + "NuGet.Versioning": "3.5.0-beta2-1392", "Newtonsoft.Json": "7.0.1", "Octokit": "0.18.0", "Microsoft.Net.Http": "2.2.29" diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 8fae6e53a..3d4c485a0 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -8,10 +8,10 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "NuGet.Versioning": "3.5.0-rc-1285", - "NuGet.Packaging": "3.5.0-rc-1285", - "NuGet.Frameworks": "3.5.0-rc-1285", - "NuGet.ProjectModel": "3.5.0-rc-1285" + "NuGet.Versioning": "3.5.0-beta2-1392", + "NuGet.Packaging": "3.5.0-beta2-1392", + "NuGet.Frameworks": "3.5.0-beta2-1392", + "NuGet.ProjectModel": "3.5.0-beta2-1392" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index ef66371b5..4cf92fbc1 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -9,8 +9,8 @@ "target": "project" }, "Newtonsoft.Json": "7.0.1", - "NuGet.Packaging": "3.5.0-rc-1285", - "NuGet.RuntimeModel": "3.5.0-rc-1285", + "NuGet.Packaging": "3.5.0-beta2-1392", + "NuGet.RuntimeModel": "3.5.0-beta2-1392", "System.Reflection.Metadata": "1.3.0-rc3-24206-00" }, "frameworks": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index d182d9107..f8a2bd407 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -21,10 +21,10 @@ }, "dependencies": { "NuGet.Commands": { - "version": "3.5.0-rc-1285", + "version": "3.5.0-beta2-1392", "exclude": "compile" }, - "NuGet.CommandLine.XPlat": "3.5.0-rc-1285", + "NuGet.CommandLine.XPlat": "3.5.0-beta2-1392", "Newtonsoft.Json": "7.0.1", "System.Text.Encoding.CodePages": "4.0.1-rc3-24206-00", "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24206-00", diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 04cb5e797..9acab57bc 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -20,10 +20,10 @@ }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", - "NuGet.Versioning": "3.5.0-rc-1285", - "NuGet.Packaging": "3.5.0-rc-1285", - "NuGet.Frameworks": "3.5.0-rc-1285", - "NuGet.ProjectModel": "3.5.0-rc-1285", + "NuGet.Versioning": "3.5.0-beta2-1392", + "NuGet.Packaging": "3.5.0-beta2-1392", + "NuGet.Frameworks": "3.5.0-beta2-1392", + "NuGet.ProjectModel": "3.5.0-beta2-1392", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From dd51836aac37a025c683b40d9cfb5d796d49cf32 Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Mon, 6 Jun 2016 15:08:46 -0700 Subject: [PATCH 14/97] fix #2289 by integrating EF's version of project load context (#3402) --- Microsoft.DotNet.Cli.sln | 74 +++++++++++++----- .../Program.cs | 11 ++- .../LoaderProjectContextExtensions.cs | 78 +++++++++++++++---- ...Microsoft.DotNet.ProjectModel.Loader.xproj | 3 +- .../ProjectLoadContext.cs | 4 +- .../Compilation/LibraryAssetExtension.cs | 15 ++++ ...oft.DotNet.ProjectModel.Loader.Tests.xproj | 21 +++++ .../ProjectLoadContextTest.cs | 33 ++++++++ .../Properties/AssemblyInfo.cs | 19 +++++ .../project.json | 29 +++++++ 10 files changed, 248 insertions(+), 39 deletions(-) create mode 100644 test/Microsoft.DotNet.ProjectModel.Loader.Tests/Microsoft.DotNet.ProjectModel.Loader.Tests.xproj create mode 100644 test/Microsoft.DotNet.ProjectModel.Loader.Tests/ProjectLoadContextTest.cs create mode 100644 test/Microsoft.DotNet.ProjectModel.Loader.Tests/Properties/AssemblyInfo.cs create mode 100644 test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index 94f8b1a93..e988fae47 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -21,8 +21,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectMod EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Testing.Abstractions", "src\Microsoft.Extensions.Testing.Abstractions\Microsoft.Extensions.Testing.Abstractions.xproj", "{DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel.Loader", "src\Microsoft.DotNet.ProjectModel.Loader\Microsoft.DotNet.ProjectModel.Loader.xproj", "{C7AF0290-EF0D-44DC-9EDC-600803B664F8}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0722D325-24C8-4E83-B5AF-0A083E7F0749}" @@ -113,6 +111,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "shared-build-targets-utils" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "update-dependencies", "build_projects\update-dependencies\update-dependencies.xproj", "{A28BD8AC-DF15-4F58-8299-98A9AE2B8726}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel.Loader", "src\Microsoft.DotNet.ProjectModel.Loader\Microsoft.DotNet.ProjectModel.Loader.xproj", "{1C599FFD-FB52-4279-A8E5-465D3EC499E1}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel.Loader.Tests", "test\Microsoft.DotNet.ProjectModel.Loader.Tests\Microsoft.DotNet.ProjectModel.Loader.Tests.xproj", "{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -205,22 +207,6 @@ Global {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.Debug|x64.ActiveCfg = Debug|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.Debug|x64.Build.0 = Debug|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.Release|Any CPU.Build.0 = Release|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.Release|x64.ActiveCfg = Release|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.Release|x64.Build.0 = Release|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.Debug|Any CPU.Build.0 = Debug|Any CPU {08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -813,6 +799,54 @@ Global {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.Debug|x64.ActiveCfg = Debug|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.Debug|x64.Build.0 = Debug|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.Release|Any CPU.Build.0 = Release|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.Release|x64.ActiveCfg = Release|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.Release|x64.Build.0 = Release|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {1DBB7542-0345-4F4B-A84B-3B00B185D416}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.Debug|x64.ActiveCfg = Debug|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.Debug|x64.Build.0 = Debug|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.Release|Any CPU.Build.0 = Release|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.Release|x64.ActiveCfg = Release|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.Release|x64.Build.0 = Release|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {1C599FFD-FB52-4279-A8E5-465D3EC499E1}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Debug|x64.ActiveCfg = Debug|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Debug|x64.Build.0 = Debug|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Release|Any CPU.Build.0 = Release|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Release|x64.ActiveCfg = Release|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.Release|x64.Build.0 = Release|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.RelWithDebInfo|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -823,7 +857,6 @@ Global {A16958E1-24C7-4F1E-B317-204AD91625DD} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {BD7833F8-3209-4682-BF75-B4BCA883E279} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {C7AF0290-EF0D-44DC-9EDC-600803B664F8} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {08A68C6A-86F6-4ED2-89A7-B166D33E9F85} = {0722D325-24C8-4E83-B5AF-0A083E7F0749} {688870C8-9843-4F9E-8576-D39290AD0F25} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {65741CB1-8AEE-4C66-8198-10A7EA0E4258} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} @@ -866,5 +899,8 @@ Global {49BEB486-AB5A-4416-91EA-8CD34ABB0C9D} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3} {B768BD29-12BF-4C7C-B093-03193FE244D1} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3} {A28BD8AC-DF15-4F58-8299-98A9AE2B8726} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3} + {1DBB7542-0345-4F4B-A84B-3B00B185D416} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3} + {1C599FFD-FB52-4279-A8E5-465D3EC499E1} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {5DF6C9DA-6909-4EC0-909E-6913580BB4A4} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} EndGlobalSection EndGlobal diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/Program.cs b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/Program.cs index 3b5a088e1..cd83437aa 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/Program.cs +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/Program.cs @@ -7,14 +7,19 @@ namespace TestProjectWithCultureSpecificResource { public class Program { - public static void Main(string[] args) + // This method is consumed by load context tests + public static string GetMessage() { var rm = new ResourceManager( "TestProjectWithCultureSpecificResource.Strings", typeof(Program).GetTypeInfo().Assembly); - Console.WriteLine(rm.GetString("hello")); - Console.WriteLine(rm.GetString("hello", new CultureInfo("fr"))); + return rm.GetString("hello") + Environment.NewLine + rm.GetString("hello", new CultureInfo("fr")); + } + + public static void Main(string[] args) + { + Console.WriteLine(GetMessage()); } } } diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/LoaderProjectContextExtensions.cs b/src/Microsoft.DotNet.ProjectModel.Loader/LoaderProjectContextExtensions.cs index b51841d79..401492aae 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/LoaderProjectContextExtensions.cs +++ b/src/Microsoft.DotNet.ProjectModel.Loader/LoaderProjectContextExtensions.cs @@ -3,47 +3,99 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Reflection; using System.Runtime.Loader; +using Microsoft.DotNet.ProjectModel.Compilation; +using Microsoft.Extensions.DependencyModel; namespace Microsoft.DotNet.ProjectModel.Loader { public static class LoaderProjectContextExtensions { public static AssemblyLoadContext CreateLoadContext( - this ProjectContext context, - string configuration = "Debug", - string outputPath = null) + this ProjectContext context, + string configuration) => CreateLoadContext(context, context.RuntimeIdentifier, configuration); + + public static AssemblyLoadContext CreateLoadContext( + this ProjectContext context, + string runtimeIdentifier, + string configuration) => CreateLoadContext(context, runtimeIdentifier, configuration); + + public static AssemblyLoadContext CreateLoadContext( + this ProjectContext context, + string runtimeIdentifier, + string configuration, + string outputPath) { var exporter = context.CreateExporter(configuration); var assemblies = new Dictionary(AssemblyNameComparer.OrdinalIgnoreCase); - var dllImports = new Dictionary(); + var nativeLibs = new Dictionary(); + var rids = DependencyContext.Default?.RuntimeGraph ?? Enumerable.Empty(); + var fallbacks = rids.FirstOrDefault(r => r.Runtime.Equals(runtimeIdentifier)); foreach (var export in exporter.GetAllExports()) { - // TODO: Handle resource assemblies - foreach (var asset in export.RuntimeAssemblyGroups.GetDefaultAssets()) + // Process managed assets + var group = string.IsNullOrEmpty(runtimeIdentifier) ? + export.RuntimeAssemblyGroups.GetDefaultGroup() : + GetGroup(export.RuntimeAssemblyGroups, runtimeIdentifier, fallbacks); + if(group != null) { - // REVIEW: Should we use the following? - // AssemblyLoadContext.GetAssemblyName(asset.ResolvedPath); - var assemblyName = new AssemblyName(asset.Name); - assemblies[assemblyName] = asset.ResolvedPath; + foreach(var asset in group.Assets) + { + assemblies[asset.GetAssemblyName()] = asset.ResolvedPath; + } } - foreach (var asset in export.NativeLibraryGroups.GetDefaultAssets()) + // Process native assets + group = string.IsNullOrEmpty(runtimeIdentifier) ? + export.NativeLibraryGroups.GetDefaultGroup() : + GetGroup(export.NativeLibraryGroups, runtimeIdentifier, fallbacks); + if(group != null) { - dllImports[asset.Name] = asset.ResolvedPath; + foreach(var asset in group.Assets) + { + nativeLibs[asset.Name] = asset.ResolvedPath; + } + } + + // Process resource assets + foreach(var asset in export.ResourceAssemblies) + { + var name = asset.Asset.GetAssemblyName(); + name.CultureName = asset.Locale; + assemblies[name] = asset.Asset.ResolvedPath; } } return new ProjectLoadContext( assemblies, - dllImports, + nativeLibs, // Add the project's output directory path to ensure project-to-project references get located new[] { context.GetOutputPaths(configuration, outputPath: outputPath).CompilationOutputPath }); } + private static LibraryAssetGroup GetGroup(IEnumerable groups, string runtimeIdentifier, RuntimeFallbacks fallbacks) + { + IEnumerable rids = new[] { runtimeIdentifier }; + if(fallbacks != null) + { + rids = Enumerable.Concat(rids, fallbacks.Fallbacks); + } + + foreach(var rid in rids) + { + var group = groups.GetRuntimeGroup(rid); + if(group != null) + { + return group; + } + } + return null; + } + private class AssemblyNameComparer : IEqualityComparer { public static readonly IEqualityComparer OrdinalIgnoreCase = new AssemblyNameComparer(); diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/Microsoft.DotNet.ProjectModel.Loader.xproj b/src/Microsoft.DotNet.ProjectModel.Loader/Microsoft.DotNet.ProjectModel.Loader.xproj index 049c639a2..95b2a8b7f 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/Microsoft.DotNet.ProjectModel.Loader.xproj +++ b/src/Microsoft.DotNet.ProjectModel.Loader/Microsoft.DotNet.ProjectModel.Loader.xproj @@ -6,12 +6,11 @@ - c7af0290-ef0d-44dc-9edc-600803b664f8 + 1c599ffd-fb52-4279-a8e5-465d3ec499e1 Microsoft.DotNet.ProjectModel.Loader ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin - 2.0 diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/ProjectLoadContext.cs b/src/Microsoft.DotNet.ProjectModel.Loader/ProjectLoadContext.cs index 44418b167..fa92273b6 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/ProjectLoadContext.cs +++ b/src/Microsoft.DotNet.ProjectModel.Loader/ProjectLoadContext.cs @@ -50,8 +50,8 @@ namespace Microsoft.DotNet.ProjectModel.Loader } public ProjectLoadContext(IDictionary assemblyPaths, - IDictionary nativeLibraries, - IEnumerable searchPaths) + IDictionary nativeLibraries, + IEnumerable searchPaths) { _assemblyPaths = assemblyPaths; _nativeLibraries = nativeLibraries; diff --git a/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryAssetExtension.cs b/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryAssetExtension.cs index 93b466639..534a114a2 100644 --- a/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryAssetExtension.cs +++ b/src/Microsoft.DotNet.ProjectModel/Compilation/LibraryAssetExtension.cs @@ -1,12 +1,27 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System; using System.IO; +using System.Reflection; namespace Microsoft.DotNet.ProjectModel.Compilation { public static class LibraryAssetExtensions { + private const string NativeImageSufix = ".ni"; + + public static AssemblyName GetAssemblyName(this LibraryAsset asset) + { + var name = asset.Name; + if (asset.Name.EndsWith(NativeImageSufix)) + { + name = name.Substring(0, name.Length - NativeImageSufix.Length); + } + + return new AssemblyName(name); + } + public static string GetTransformedFile(this LibraryAsset asset, string tempLocation, string tempName = null) { if (asset.Transform == null) diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/Microsoft.DotNet.ProjectModel.Loader.Tests.xproj b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/Microsoft.DotNet.ProjectModel.Loader.Tests.xproj new file mode 100644 index 000000000..c0cd383ea --- /dev/null +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/Microsoft.DotNet.ProjectModel.Loader.Tests.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + 5df6c9da-6909-4ec0-909e-6913580bb4a4 + Microsoft.DotNet.ProjectModel.Loader.Tests + .\obj + .\bin\ + v4.6.1 + + + + 2.0 + + + diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/ProjectLoadContextTest.cs b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/ProjectLoadContextTest.cs new file mode 100644 index 000000000..1e3c562ea --- /dev/null +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/ProjectLoadContextTest.cs @@ -0,0 +1,33 @@ +using System; +using System.Reflection; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Tools.Test.Utilities; +using Microsoft.Extensions.DependencyModel; +using NuGet.Frameworks; +using Xunit; + +namespace Microsoft.DotNet.ProjectModel.Loader.Tests +{ + public class ProjectLoadContextTest : TestBase + { + [Fact] + public void LoadContextCanLoadProjectOutput() + { + var testInstance = TestAssetsManager.CreateTestInstance("TestProjectWithResource") + .WithLockFiles() + .WithBuildArtifacts(); + + var rid = DependencyContext.Default.Target.Runtime; + + var context = ProjectContext.Create(testInstance.TestRoot, NuGetFramework.Parse("netcoreapp1.0"), new[] { rid }); + var loadContext = context.CreateLoadContext(rid, Constants.DefaultConfiguration); + + // Load the project assembly + var asm = loadContext.LoadFromAssemblyName(new AssemblyName("TestProjectWithResource")); + + // Call Program.GetMessage() and assert the output + var message = (string)asm.GetType("TestProjectWithCultureSpecificResource").GetRuntimeMethod("GetMessage", Type.EmptyTypes).Invoke(null, new object[0]); + Assert.Equal("Hello World!" + Environment.NewLine + "Bonjour!", message); + } + } +} diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..d78c5952d --- /dev/null +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Microsoft.DotNet.ProjectModel.Loader.Tests")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("5df6c9da-6909-4ec0-909e-6913580bb4a4")] diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json new file mode 100644 index 000000000..8dae662a6 --- /dev/null +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json @@ -0,0 +1,29 @@ +{ + "version": "1.0.0-*", + "buildOptions": { + "keyFile": "../../tools/test_key.snk" + }, + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004363" + }, + "Microsoft.DotNet.ProjectModel.Loader": { + "target": "project" + }, + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-rc2-192208-24" + }, + "frameworks": { + "netcoreapp1.0": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] + } + }, + "testRunner": "xunit" +} From 334b079995946c872417995ed32638590552f077 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 6 Jun 2016 18:56:24 -0500 Subject: [PATCH 15/97] Updating CoreSetup, Roslyn, DiaSymReader to rc3-004408, beta1-20160606-02, 1.0.8-rc2-60606-01 respectively. --- .../AppWithDirectDependencyDesktopAndPortable/project.json | 2 +- .../TestProjectWithUnresolvedDependency/project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../DthTestProjects/src/EmptyConsoleApp/project.json | 2 +- .../DthTestProjects/src/EmptyNetCoreApp/project.json | 2 +- .../DthTestProjects/src/FailReleaseProject/project.json | 2 +- .../src/IncompatiblePackageSample/project.json | 2 +- .../IncorrectGlobalJson/src/Project1/project.json | 2 +- TestAssets/TestPackages/ToolWithOutputName/project.json | 2 +- .../dotnet-dependency-context-test/project.json | 2 +- .../dotnet-dependency-tool-invoker/project.json | 2 +- .../TestPackages/dotnet-desktop-and-portable/project.json | 2 +- .../TestPackages/dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-hello/v2/dotnet-hello/project.json | 2 +- TestAssets/TestPackages/dotnet-portable/project.json | 2 +- .../TestProjects/AppWithAppDependency/TestApp1/project.json | 2 +- .../TestProjects/AppWithAppDependency/TestApp2/project.json | 2 +- TestAssets/TestProjects/AppWithBomGlobalJson/project.json | 2 +- .../AppWithDependencyOnToolWithOutputName/project.json | 2 +- .../AppWithDirectAndToolDependency/project.json | 2 +- .../TestProjects/AppWithDirectDependency/project.json | 2 +- .../AppWithDirectDependencyAndTypeBuild/project.json | 2 +- .../AppWithDirectDependencyWithOutputName/project.json | 2 +- TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json | 2 +- .../TestProjects/AppWithOutputAssemblyName/project.json | 2 +- TestAssets/TestProjects/AppWithToolDependency/project.json | 2 +- TestAssets/TestProjects/CompileFail/project.json | 2 +- .../PortableApp_Standalone/project.json | 2 +- .../TestProjects/DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/TestApp/project.json | 2 +- .../DependencyContextValidator/TestAppDeps/project.json | 2 +- .../DependencyContextValidator/TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- TestAssets/TestProjects/EndToEndTestApp/project.json | 2 +- .../FSharpTestProjects/CompileFailApp/project.json | 2 +- .../TestProjects/FSharpTestProjects/TestApp/project.json | 2 +- .../FSharpTestProjects/TestAppWithArgs/project.json | 2 +- .../TestProjects/KestrelSample/KestrelPortable/project.json | 2 +- .../KestrelSample/KestrelStandalone/project.json | 2 +- .../TestProjects/OutputStandardOutputAndError/project.json | 2 +- .../PerformanceTestProjects/SingleTargetApp/project.json | 2 +- .../SingleTargetGraph/SingleTargetP0/project.json | 2 +- .../SingleTargetGraph/SingleTargetP1/project.json | 2 +- .../SingleTargetGraph/SingleTargetP2/project.json | 2 +- .../PerformanceTestProjects/TwoTargetApp/project.json | 2 +- .../TwoTargetGraph/TwoTargetP0/project.json | 2 +- .../TwoTargetGraph/TwoTargetP1/project.json | 2 +- .../TwoTargetGraph/TwoTargetP2/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP0/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP1/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP2/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP3/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP4/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP5/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP6/project.json | 2 +- .../TestProjects/PortableTests/PortableApp/project.json | 2 +- .../PortableAppCompilationContext/project.json | 4 ++-- .../PortableTests/PortableAppWithNative/project.json | 2 +- .../TestProjects/PortableTests/StandaloneApp/project.json | 2 +- .../ProjectsWithTests/MultipleFrameworkProject/project.json | 2 +- .../ProjectsWithTests/NetCoreAppOnlyProject/project.json | 2 +- TestAssets/TestProjects/ResourcesTests/TestApp/project.json | 2 +- .../RunTestsApps/TestAppMultiTarget/project.json | 2 +- .../TestAppCompilationContext/TestApp/project.json | 2 +- TestAssets/TestProjects/TestAppSimple/project.json | 2 +- TestAssets/TestProjects/TestAppWithArgs/project.json | 2 +- .../TestAppWithBuildDependency/App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestProjects/TestAppWithContentPackage/project.json | 2 +- TestAssets/TestProjects/TestAppWithContents/project.json | 2 +- .../TestProjects/TestAppWithLibrary/TestApp/project.json | 2 +- .../TestProjects/TestAppWithResourceDeps/project.json | 2 +- TestAssets/TestProjects/TestAppWithScripts/project.json | 2 +- .../TestAppWithTransitiveAppDependency/TestApp/project.json | 2 +- TestAssets/TestProjects/TestAppWithUnicodéPath/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestProjects/TestMicrosoftCSharpReference/project.json | 2 +- .../project.json | 2 +- TestAssets/TestProjects/TestMscorlibReference/project.json | 2 +- .../TestProjectContextBuildAllDedupe/project.json | 2 +- .../TestProjectToProjectDependencies/src/L0/project.json | 2 +- .../TestProjectWithCultureSpecificResource/project.json | 2 +- .../TestProjects/TestProjectWithResource/project.json | 2 +- .../TestProjects/TestSimpleIncrementalApp/project.json | 2 +- .../TestProjects/TestSystemCoreReference/project.json | 2 +- TestAssets/TestProjects/TestSystemReference/project.json | 2 +- build_projects/dotnet-cli-build/CliDependencyVersions.cs | 4 ++-- src/Microsoft.DotNet.Compiler.Common/project.json | 2 +- src/Microsoft.DotNet.ProjectModel.Workspaces/project.json | 2 +- src/Microsoft.Extensions.Testing.Abstractions/project.json | 2 +- src/compilers/project.json | 6 +++--- src/dotnet-compile-fsc/project.json | 2 +- .../dotnet-new/CSharp_Console/project.json.template | 2 +- .../dotnet-new/FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 2 +- test/ArgumentForwardingTests/project.json | 2 +- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 2 +- test/Kestrel.Tests/project.json | 2 +- test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 2 +- test/Microsoft.DotNet.Compiler.Common.Tests/project.json | 2 +- .../Microsoft.DotNet.ProjectModel.Loader.Tests/project.json | 4 ++-- test/Microsoft.DotNet.ProjectModel.Tests/project.json | 2 +- .../Microsoft.Extensions.DependencyModel.Tests/project.json | 2 +- test/Performance/project.json | 2 +- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 2 +- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 2 +- test/dotnet-compile.UnitTests/project.json | 2 +- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 2 +- test/dotnet-projectmodel-server.Tests/project.json | 2 +- test/dotnet-publish.Tests/project.json | 2 +- test/dotnet-resgen.Tests/project.json | 2 +- test/dotnet-run.Tests/project.json | 2 +- test/dotnet-run.UnitTests/project.json | 2 +- test/dotnet-test.Tests/project.json | 2 +- test/dotnet-test.UnitTests/project.json | 2 +- test/dotnet.Tests/project.json | 2 +- tools/MultiProjectValidator/project.json | 2 +- 125 files changed, 130 insertions(+), 130 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index 67aef28b4..529be14db 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } }, "imports": [ diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index d14f8c25a..801188afb 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index f82906b12..02bcec5cf 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406", + "Microsoft.NETCore.App": "1.0.0-rc3-004408", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index 984bdc82c..2eeac838a 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index e9611cac8..aa74f4021 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index 50bfe42ac..b5059852b 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 374f7b6dc..ba7bba9dc 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406", + "Microsoft.NETCore.App": "1.0.0-rc3-004408", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index 2f55fa62b..63e5c8ad3 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index 8245f890d..ad3db4851 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index 8e3e6360a..2cfca22f2 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index cbd1e8faf..66cf4b74e 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index 9ceaf7bc7..7ec34ed59 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index 5a515b2dd..00dcdf4d7 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index 0e5e16e97..ed1ca6df2 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 92dc57b18..272371149 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index 51a5dd04c..ec09d839d 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index 4470621fc..ca6544015 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index c1aa52328..0b0f090ef 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index 189a4ac3e..840728a83 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004406", + "version": "1.0.0-rc3-004408", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 6075151ff..80c4df3e6 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406", + "Microsoft.NETCore.App": "1.0.0-rc3-004408", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index f20e58840..fdeaa525e 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406", + "Microsoft.NETCore.App": "1.0.0-rc3-004408", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index 721336663..11b5c5d6c 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004406", + "version": "1.0.0-rc3-004408", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index 3ae9d4c50..2cd48fd93 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004406", + "version": "1.0.0-rc3-004408", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json index aff4727e9..4aad5d5b9 100644 --- a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json +++ b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160602-01" + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160606-02" }, "frameworks": { "net46": {} diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 94a5923a4..36f48b73e 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 0307ee0d7..75c733d05 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 826349526..6b7552531 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index 4470621fc..ca6544015 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index d233f6f00..53e095242 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 5ad6cb402..fc754d812 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406", + "Microsoft.NETCore.App": "1.0.0-rc3-004408", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index 175eda783..447169eaf 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406", + "Microsoft.NETCore.App": "1.0.0-rc3-004408", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 0e2a97ffd..82066b923 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index d116d85e7..4e1a91371 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index 1d298b0ba..5acf58b52 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index 050a74bbe..5aeebbaf6 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index 858fdf500..d16664dd9 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004406", + "Microsoft.NETCore.App": "1.0.0-rc3-004408", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index e980d0af9..9d08d5709 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index e3be1a7c1..fa07e503b 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index b44fc5fa4..02530ac82 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 826349526..6b7552531 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index 16040c371..3f8fabe7f 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index 6f67139b2..f6c2a5670 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index 6f72143fe..c2a6e4960 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index f8fc5aa46..ff5cb813a 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index 1219e6d15..bb6d55e54 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 595e645a4..c6aca8fd9 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index 9f8a1ecf1..1d04fcf04 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index 35ecf9e6e..b0d7bf9f1 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 13592a639..2fa1a45da 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index 6a4b29d27..980dec8af 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index db76c80de..85ff6aa60 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index 499b2dde7..6c80127f1 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index ff0bab982..31fd6c9d7 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index 35ecf9e6e..b0d7bf9f1 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index 35ecf9e6e..b0d7bf9f1 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index c5569c8e6..ae82019e8 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index ab369e316..25223bf2b 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -4,14 +4,14 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160602-01" + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160606-02" }, "frameworks": { "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index d40997530..3391f7ef6 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index 4c5e57527..a33505995 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index c92259434..16dc21a7f 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -15,7 +15,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Linq.Expressions": "4.1.0-rc3-24206-00", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00" diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index bd7aeb582..edf861d4a 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Linq.Expressions": "4.1.0-rc3-24206-00", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index 6ba3a72e9..e8fd9078d 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 9d5fee815..39cc4cd6b 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004406", + "version": "1.0.0-rc3-004408", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index c2d0ea3e7..e7190ecdc 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index 826349526..6b7552531 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 826349526..6b7552531 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index c8bf82c96..f683103ef 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index 754925663..d217b22c2 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index 8e0251fb8..f589f50e4 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406", + "Microsoft.NETCore.App": "1.0.0-rc3-004408", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index d0f39f263..ad53b0244 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index b40375f67..d979cb9dc 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index ad2b53c92..e4fe38643 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406", + "Microsoft.NETCore.App": "1.0.0-rc3-004408", "Microsoft.CSharp": "4.0.1-rc3-24206-00", "System.Dynamic.Runtime": "4.0.11-rc3-24206-00", "System.Reflection.Metadata": "1.3.0-rc3-24206-00", diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index ea85e3ac1..e4c227b96 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index 9b95b573c..47b3cea19 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index 826349526..6b7552531 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index b40375f67..d979cb9dc 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index e42f06a2c..9cf10cace 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 69d920014..75eb7a8c5 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,7 +5,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" } }, "net451": { diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index 99eb75c2d..12abfd906 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,7 +5,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" } }, "netcore50": { diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 5d58e6933..ebdcb0937 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index 2d5db6365..318dc9c22 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004406", + "version": "1.0.0-rc3-004408", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index b867d9b96..1f721494e 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 826349526..6b7552531 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 826349526..6b7552531 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index e54230da9..d89c25b21 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index bdbe6f7f1..68f7aebe1 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index fd849d6d7..c12c2affd 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406" + "Microsoft.NETCore.App": "1.0.0-rc3-004408" } }, "net451": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index 61d5d59e9..639d289c0 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004406"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004406-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004408"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004408-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index b92f13e26..06ab328f7 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -4,7 +4,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160602-01", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160606-02", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 274ad1e33..4ba68725a 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -10,7 +10,7 @@ "Microsoft.DotNet.Compiler.Common": { "target": "project" }, - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160602-01" + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160606-02" }, "frameworks": { "net451": { diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 53b2fa058..032960e35 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.DiaSymReader": "1.0.6", + "Microsoft.DiaSymReader": "1.0.8-rc2-60606-01", "Microsoft.DiaSymReader.Native": "1.4.0-rc" }, "frameworks": { diff --git a/src/compilers/project.json b/src/compilers/project.json index e81427d69..10db43eab 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,10 +6,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160602-01", - "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160602-01", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160606-02", + "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160606-02", "Microsoft.DiaSymReader.Native": "1.4.0-rc" }, "frameworks": { diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 6e0b86b9e..e785e27f6 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index 268d395f2..ef53c8892 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index ebe665195..f438c4f9c 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index d182d9107..5b2a6051a 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -43,7 +43,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24206-00", diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 41e3f1afb..1f1787b60 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.ProjectModel": { diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 323ec5798..1228e2154 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index a5ffda87d..af96c7cc7 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.ProjectModel": { diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index e1cd2fd67..4f834cac9 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 04cb5e797..387896559 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,7 +16,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 7f02dcc1d..180d61053 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json index 8dae662a6..8778780b2 100644 --- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.0.0-*", "buildOptions": { "keyFile": "../../tools/test_key.snk" @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004408" }, "Microsoft.DotNet.ProjectModel.Loader": { "target": "project" diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index c578cd592..abe2c8936 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.ProjectModel": { diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 386a06ac2..866d02b62 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Performance/project.json b/test/Performance/project.json index ff5228920..5d3e6b6f8 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.ProjectModel": { diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 3fa92a3b0..8288dc8d5 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index 9eb4da9ff..c04f25dac 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index 4b65c3188..6d2140950 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index 00d620fd9..32b3df01e 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 20a4e252c..444a8b4ad 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index dcec07300..c63a936ab 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 6bfcba132..f79302266 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index fdfc1d684..85d2f3e48 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index 4a0a6cfd0..4c32c3ecc 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 5054a5031..17fc73adc 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "System.IO.Compression.ZipFile": "4.0.1-rc3-24206-00", diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 391de2b0f..ec3cc9636 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "dotnet": { "target": "project" diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 4e80cd5f9..e51f14752 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.TestFramework": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 2a7e61c84..d088f0590 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index e1cd2fd67..4f834cac9 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index 24ae0e881..eec2b84d6 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "dotnet": { diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index fa4aea2f4..59136747d 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Newtonsoft.Json": "7.0.1", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 82a3e3b84..599085dac 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "Newtonsoft.Json": "7.0.1", "dotnet": { diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 300328d2b..849214684 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004406" + "version": "1.0.0-rc3-004408" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index feab49f6b..03d87a34e 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004406", + "Microsoft.NETCore.App": "1.0.0-rc3-004408", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From dc5fbc1a9187f17317112b65a0fdde887f703212 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Mon, 6 Jun 2016 16:23:23 -0700 Subject: [PATCH 16/97] Adding basic cycle detection in the dependency walker --- .../.noautobuild | 0 .../Program.cs | 12 ++++++++++++ .../project.json | 16 ++++++++++++++++ .../dotnet-build/ProjectGraphCollector.cs | 2 +- .../Commands/RestoreCommand.cs | 6 ++++++ test/dotnet-build.Tests/BuildOutputTests.cs | 12 ++++++++++++ 6 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/.noautobuild create mode 100644 TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/Program.cs create mode 100644 TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/.noautobuild b/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/.noautobuild new file mode 100644 index 000000000..e69de29bb diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/Program.cs b/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/Program.cs new file mode 100644 index 000000000..24b0cd5f1 --- /dev/null +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/Program.cs @@ -0,0 +1,12 @@ +using System; + +namespace ConsoleApplication +{ + public class Program + { + public static void Main(string[] args) + { + Console.WriteLine("Hello World!"); + } + } +} diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json new file mode 100644 index 000000000..cd24d0e88 --- /dev/null +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json @@ -0,0 +1,16 @@ +{ + "version": "1.0.0-*", + "buildOptions": { + "emitEntryPoint": true + }, + "dependencies": { + "TestProjectWithSelfReferencingDependency": { + "target": "project" + } + }, + "frameworks": { + "netcoreapp1.0": { + "imports": "dnxcore50" + } + } +} diff --git a/src/dotnet/commands/dotnet-build/ProjectGraphCollector.cs b/src/dotnet/commands/dotnet-build/ProjectGraphCollector.cs index 7fe7d88d2..cc2a261fe 100644 --- a/src/dotnet/commands/dotnet-build/ProjectGraphCollector.cs +++ b/src/dotnet/commands/dotnet-build/ProjectGraphCollector.cs @@ -43,7 +43,7 @@ namespace Microsoft.DotNet.Tools.Build foreach (var dependency in project.Dependencies) { LibraryDescription libraryDescription; - if (lookup.TryGetValue(dependency.Name, out libraryDescription)) + if ((lookup.TryGetValue(dependency.Name, out libraryDescription)) && (!libraryDescription.Identity.Name.Equals(project.Identity.Name))) { if (libraryDescription.Resolved && libraryDescription.Identity.Type.Equals(LibraryType.Project)) { diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreCommand.cs index a533c1a91..6c88478e2 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreCommand.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/RestoreCommand.cs @@ -19,5 +19,11 @@ namespace Microsoft.DotNet.Tools.Test.Utilities return base.Execute(args); } + + public override CommandResult ExecuteWithCapturedOutput(string args = "") + { + args = $"restore {args}"; + return base.ExecuteWithCapturedOutput(args); + } } } diff --git a/test/dotnet-build.Tests/BuildOutputTests.cs b/test/dotnet-build.Tests/BuildOutputTests.cs index 852f563fe..ebf5bc522 100644 --- a/test/dotnet-build.Tests/BuildOutputTests.cs +++ b/test/dotnet-build.Tests/BuildOutputTests.cs @@ -351,6 +351,18 @@ namespace Microsoft.DotNet.Tools.Builder.Tests buildResult.StdErr.Should().Contain("The project has not been restored or restore failed - run `dotnet restore`"); } + [Fact] + private void App_WithSelfReferencingDependency_FailsBuild() + { + var testAssetsManager = GetTestGroupTestAssetsManager("NonRestoredTestProjects"); + var testInstance = testAssetsManager.CreateTestInstance("TestProjectWithSelfReferencingDependency") + .WithLockFiles(); + + var restoreResult = new RestoreCommand() { WorkingDirectory = testInstance.TestRoot }.ExecuteWithCapturedOutput(); + restoreResult.Should().Fail(); + restoreResult.StdOut.Should().Contain("error: Cycle detected"); + } + private void CopyProjectToTempDir(string projectDir, TempDirectory tempDir) { // copy all the files to temp dir From cdf4407419b6fafa25af948541b9cac5adeea05c Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Mon, 6 Jun 2016 13:57:19 -0700 Subject: [PATCH 17/97] Bumping JSON.NET to 9.0.1 --- build_projects/update-dependencies/project.json | 2 +- src/Microsoft.DotNet.ProjectModel/project.json | 2 +- src/Microsoft.Extensions.DependencyModel/project.json | 2 +- .../project.json | 2 +- src/dotnet/project.json | 2 +- .../GivenThatIWantToLoadAProjectJsonFile.cs | 8 ++++---- test/dotnet-build.Tests/project.json | 2 +- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-test.Tests/project.json | 2 +- test/dotnet-test.UnitTests/project.json | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 2622595e7..79bd9b2d6 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -13,7 +13,7 @@ "target": "project" }, "NuGet.Versioning": "3.5.0-beta2-1392", - "Newtonsoft.Json": "7.0.1", + "Newtonsoft.Json": "9.0.1-beta1", "Octokit": "0.18.0", "Microsoft.Net.Http": "2.2.29" }, diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 4cf92fbc1..5425752cf 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -8,7 +8,7 @@ "Microsoft.Extensions.DependencyModel": { "target": "project" }, - "Newtonsoft.Json": "7.0.1", + "Newtonsoft.Json": "9.0.1-beta1", "NuGet.Packaging": "3.5.0-beta2-1392", "NuGet.RuntimeModel": "3.5.0-beta2-1392", "System.Reflection.Metadata": "1.3.0-rc3-24206-00" diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 3d16170ee..81fe54b52 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -9,7 +9,7 @@ "Microsoft.DotNet.InternalAbstractions": { "target": "project" }, - "Newtonsoft.Json": "7.0.1" + "Newtonsoft.Json": "9.0.1-beta1" }, "frameworks": { "net451": {}, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 032960e35..262216fa3 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -7,7 +7,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Newtonsoft.Json": "7.0.1", + "Newtonsoft.Json": "9.0.1-beta1", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 11b2a2daa..ba11a9dda 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -25,7 +25,7 @@ "exclude": "compile" }, "NuGet.CommandLine.XPlat": "3.5.0-beta2-1392", - "Newtonsoft.Json": "7.0.1", + "Newtonsoft.Json": "9.0.1-beta1", "System.Text.Encoding.CodePages": "4.0.1-rc3-24206-00", "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24206-00", "Microsoft.ApplicationInsights": "2.0.0", diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/GivenThatIWantToLoadAProjectJsonFile.cs b/test/Microsoft.DotNet.ProjectModel.Tests/GivenThatIWantToLoadAProjectJsonFile.cs index 024ecaa2a..86dfd56b9 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/GivenThatIWantToLoadAProjectJsonFile.cs +++ b/test/Microsoft.DotNet.ProjectModel.Tests/GivenThatIWantToLoadAProjectJsonFile.cs @@ -747,7 +747,7 @@ namespace Microsoft.DotNet.ProjectModel.Tests dependency.Type.Should().Be(LibraryDependencyType.Default); dependency.SourceFilePath.Should().Be(ProjectFilePath); dependency.SourceLine.Should().Be(3); - dependency.SourceColumn.Should().Be(31); + dependency.SourceColumn.Should().Be(30); } [Fact] @@ -769,7 +769,7 @@ namespace Microsoft.DotNet.ProjectModel.Tests dependency.Type.Should().Be(LibraryDependencyType.Default); dependency.SourceFilePath.Should().Be(ProjectFilePath); dependency.SourceLine.Should().Be(3); - dependency.SourceColumn.Should().Be(25); + dependency.SourceColumn.Should().Be(24); } [Fact] @@ -909,7 +909,7 @@ namespace Microsoft.DotNet.ProjectModel.Tests tool.Type.Should().Be(LibraryDependencyType.Default); tool.SourceFilePath.Should().Be(ProjectFilePath); tool.SourceLine.Should().Be(3); - tool.SourceColumn.Should().Be(25); + tool.SourceColumn.Should().Be(24); } [Fact] @@ -931,7 +931,7 @@ namespace Microsoft.DotNet.ProjectModel.Tests tool.Type.Should().Be(LibraryDependencyType.Default); tool.SourceFilePath.Should().Be(ProjectFilePath); tool.SourceLine.Should().Be(3); - tool.SourceColumn.Should().Be(19); + tool.SourceColumn.Should().Be(18); } [Fact] diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 444a8b4ad..b8ab8b0cd 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "Newtonsoft.Json": "7.0.1", + "Newtonsoft.Json": "9.0.1-beta1", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index 4c32c3ecc..767ea22d5 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -8,7 +8,7 @@ "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, - "Newtonsoft.Json": "7.0.1", + "Newtonsoft.Json": "9.0.1-beta1", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 59136747d..4b6ea6f34 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -5,7 +5,7 @@ "type": "platform", "version": "1.0.0-rc3-004408" }, - "Newtonsoft.Json": "7.0.1", + "Newtonsoft.Json": "9.0.1-beta1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 599085dac..85fc1484b 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -5,7 +5,7 @@ "type": "platform", "version": "1.0.0-rc3-004408" }, - "Newtonsoft.Json": "7.0.1", + "Newtonsoft.Json": "9.0.1-beta1", "dotnet": { "target": "project" }, From 748516bb0dd78bce36db53f5f08c738ea0f252bc Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 7 Jun 2016 12:14:14 -0500 Subject: [PATCH 18/97] Add CoreClr dependency to CLI's update-dependencies. --- build_projects/update-dependencies/Config.cs | 3 ++ .../update-dependencies/UpdateFilesTargets.cs | 38 ++++++++----------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/build_projects/update-dependencies/Config.cs b/build_projects/update-dependencies/Config.cs index f495e2bcc..1221d2d00 100644 --- a/build_projects/update-dependencies/Config.cs +++ b/build_projects/update-dependencies/Config.cs @@ -19,6 +19,7 @@ namespace Microsoft.DotNet.Scripts /// The following Environment Variables can optionally be specified: /// /// COREFX_VERSION_URL - The Url to get the current CoreFx package versions. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/corefx/release/1.0.0/Latest_Packages.txt") + /// CORECLR_VERSION_URL - The Url to get the current CoreCLR version. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/coreclr/release/1.0.0/Latest_Packages.txt") /// ROSLYN_VERSION_URL - The Url to get the current Roslyn version. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/roslyn/netcore1.0/Latest_Packages.txt") /// CORESETUP_VERSION_URL - The Url to get the current dotnet/core-setup package versions. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/core-setup/release/1.0.0/Latest_Packages.txt") /// GITHUB_ORIGIN_OWNER - The owner of the GitHub fork to push the commit and create the PR from. (ex. "dotnet-bot") @@ -36,6 +37,7 @@ namespace Microsoft.DotNet.Scripts private Lazy _password = new Lazy(() => GetEnvironmentVariable("GITHUB_PASSWORD")); private Lazy _coreFxVersionUrl = new Lazy(() => GetEnvironmentVariable("COREFX_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/corefx/release/1.0.0/Latest_Packages.txt")); + private Lazy _coreClrVersionUrl = new Lazy(() => GetEnvironmentVariable("CORECLR_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/coreclr/release/1.0.0/Latest_Packages.txt")); private Lazy _roslynVersionUrl = new Lazy(() => GetEnvironmentVariable("ROSLYN_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/roslyn/netcore1.0/Latest_Packages.txt")); private Lazy _coreSetupVersionUrl = new Lazy(() => GetEnvironmentVariable("CORESETUP_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/core-setup/release/1.0.0/Latest_Packages.txt")); private Lazy _gitHubOriginOwner; @@ -55,6 +57,7 @@ namespace Microsoft.DotNet.Scripts public string Email => _email.Value; public string Password => _password.Value; public string CoreFxVersionUrl => _coreFxVersionUrl.Value; + public string CoreClrVersionUrl => _coreClrVersionUrl.Value; public string RoslynVersionUrl => _roslynVersionUrl.Value; public string CoreSetupVersionUrl => _coreSetupVersionUrl.Value; public string GitHubOriginOwner => _gitHubOriginOwner.Value; diff --git a/build_projects/update-dependencies/UpdateFilesTargets.cs b/build_projects/update-dependencies/UpdateFilesTargets.cs index 0b5d55de2..a86943993 100644 --- a/build_projects/update-dependencies/UpdateFilesTargets.cs +++ b/build_projects/update-dependencies/UpdateFilesTargets.cs @@ -32,6 +32,7 @@ namespace Microsoft.DotNet.Scripts List dependencyInfos = c.GetDependencyInfos(); dependencyInfos.Add(CreateDependencyInfo("CoreFx", Config.Instance.CoreFxVersionUrl).Result); + dependencyInfos.Add(CreateDependencyInfo("CoreClr", Config.Instance.CoreClrVersionUrl).Result); dependencyInfos.Add(CreateDependencyInfo("Roslyn", Config.Instance.RoslynVersionUrl).Result); dependencyInfos.Add(CreateDependencyInfo("CoreSetup", Config.Instance.CoreSetupVersionUrl).Result); @@ -210,19 +211,15 @@ namespace Microsoft.DotNet.Scripts { ReplaceFileContents(@"build_projects\shared-build-targets-utils\DependencyVersions.cs", fileContents => { - DependencyInfo coreFXInfo = c.GetCoreFXDependency(); - - fileContents = ReplaceDependencyVersion(fileContents, coreFXInfo, "CoreCLRVersion", "Microsoft.NETCore.Runtime.CoreCLR"); + fileContents = ReplaceDependencyVersion(c, fileContents, "CoreCLRVersion", "Microsoft.NETCore.Runtime.CoreCLR"); return fileContents; }); ReplaceFileContents(@"build_projects\dotnet-cli-build\CliDependencyVersions.cs", fileContents => { - DependencyInfo coreSetupInfo = c.GetCoreSetupDependency(); - - fileContents = ReplaceDependencyVersion(fileContents, coreSetupInfo, "SharedFrameworkVersion", "Microsoft.NETCore.App"); - fileContents = ReplaceDependencyVersion(fileContents, coreSetupInfo, "SharedHostVersion", "Microsoft.NETCore.DotNetHost"); + fileContents = ReplaceDependencyVersion(c, fileContents, "SharedFrameworkVersion", "Microsoft.NETCore.App"); + fileContents = ReplaceDependencyVersion(c, fileContents, "SharedHostVersion", "Microsoft.NETCore.DotNetHost"); return fileContents; }); @@ -230,32 +227,29 @@ namespace Microsoft.DotNet.Scripts return c.Success(); } - private static DependencyInfo GetCoreFXDependency(this BuildTargetContext c) - { - return c.GetDependencyInfos().Single(d => d.Name == "CoreFx"); - } - - private static DependencyInfo GetCoreSetupDependency(this BuildTargetContext c) - { - return c.GetDependencyInfos().Single(d => d.Name == "CoreSetup"); - } - - private static string ReplaceDependencyVersion(string fileContents, DependencyInfo dependencyInfo, string dependencyPropertyName, string packageId) + private static string ReplaceDependencyVersion(BuildTargetContext c, string fileContents, string dependencyPropertyName, string packageId) { Regex regex = new Regex($@"{dependencyPropertyName} = ""(?.*)"";"); + string newVersion = c.GetNewVersion(packageId); - string newVersion = dependencyInfo - .NewVersions + return regex.ReplaceGroupValue(fileContents, "version", newVersion); + } + + private static string GetNewVersion(this BuildTargetContext c, string packageId) + { + string newVersion = c.GetDependencyInfos() + .SelectMany(d => d.NewVersions) .FirstOrDefault(p => p.Id == packageId) ?.Version .ToNormalizedString(); if (string.IsNullOrEmpty(newVersion)) { - throw new InvalidOperationException($"Could not find package version information for '{packageId}'"); + c.Error($"Could not find package version information for '{packageId}'"); + return $"DEPENDENCY '{packageId}' NOT FOUND"; } - return regex.ReplaceGroupValue(fileContents, "version", newVersion); + return newVersion; } private static void ReplaceFileContents(string repoRelativePath, Func replacement) From 82ef0304bb2289f36a18c718b3e9f07d01992115 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 7 Jun 2016 12:36:13 -0500 Subject: [PATCH 19/97] Crossgen now requires a Jit package to be specified. Port Crossgen fix from core-setup. See https://github.com/dotnet/core-setup/commit/a2857af7e34d5b2fceb2cdc5ea6c3b46a6f3e6d6 --- .../dotnet-cli-build/CompileTargets.cs | 2 +- .../DependencyVersions.cs | 1 + .../Utils/Crossgen.cs | 96 ++++++++++++------- .../Utils/SharedFrameworkPublisher.cs | 2 +- .../update-dependencies/UpdateFilesTargets.cs | 1 + 5 files changed, 66 insertions(+), 36 deletions(-) diff --git a/build_projects/dotnet-cli-build/CompileTargets.cs b/build_projects/dotnet-cli-build/CompileTargets.cs index a8af93df8..1c1b6332d 100644 --- a/build_projects/dotnet-cli-build/CompileTargets.cs +++ b/build_projects/dotnet-cli-build/CompileTargets.cs @@ -56,7 +56,7 @@ namespace Microsoft.DotNet.Cli.Build public const string SharedFrameworkName = "Microsoft.NETCore.App"; - public static Crossgen CrossgenUtil = new Crossgen(DependencyVersions.CoreCLRVersion); + public static Crossgen CrossgenUtil = new Crossgen(DependencyVersions.CoreCLRVersion, DependencyVersions.JitVersion); // Updates the stage 2 with recent changes. [Target(nameof(PrepareTargets.Init), nameof(CompileStage2))] diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index f37814580..15193a4c1 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -8,5 +8,6 @@ namespace Microsoft.DotNet.Cli.Build public class DependencyVersions { public static readonly string CoreCLRVersion = "1.0.2-rc3-24206-00"; + public static readonly string JitVersion = "1.0.2-rc3-24206-00"; } } diff --git a/build_projects/shared-build-targets-utils/Utils/Crossgen.cs b/build_projects/shared-build-targets-utils/Utils/Crossgen.cs index 0d5468e9f..1d30acb37 100644 --- a/build_projects/shared-build-targets-utils/Utils/Crossgen.cs +++ b/build_projects/shared-build-targets-utils/Utils/Crossgen.cs @@ -11,8 +11,9 @@ namespace Microsoft.DotNet.Cli.Build public class Crossgen { private string _coreClrVersion; + private string _jitVersion; private string _crossGenPath; - private static readonly string[] s_excludedLibraries = + private static readonly string[] s_excludedLibraries = { "mscorlib.dll", "mscorlib.ni.dll", @@ -25,9 +26,10 @@ namespace Microsoft.DotNet.Cli.Build // in CompileTargets and the one in the shared library project.json match and are updated in lock step, but long term // we need to be able to look at the project.lock.json file and figure out what version of Microsoft.NETCore.Runtime.CoreCLR // was used, and then select that version. - public Crossgen(string coreClrVersion) + public Crossgen(string coreClrVersion, string jitVersion) { _coreClrVersion = coreClrVersion; + _jitVersion = jitVersion; _crossGenPath = GetCrossgenPathForVersion(); } @@ -48,21 +50,59 @@ namespace Microsoft.DotNet.Cli.Build private string GetLibCLRJitPathForVersion() { - var coreclrRid = GetCoreCLRRid(); - var crossgenPackagePath = GetCrossGenPackagePathForVersion(); + var jitRid = GetCoreCLRRid(); + var jitPackagePath = GetJitPackagePathForVersion(); - if (crossgenPackagePath == null) + if (jitPackagePath == null) { return null; } return Path.Combine( - crossgenPackagePath, + jitPackagePath, "runtimes", - coreclrRid, + jitRid, "native", $"{Constants.DynamicLibPrefix}clrjit{Constants.DynamicLibSuffix}"); - } + } + + private string GetJitPackagePathForVersion() + { + string jitRid = GetCoreCLRRid(); + + if (jitRid == null) + { + return null; + } + + string packageId = $"runtime.{jitRid}.Microsoft.NETCore.Jit"; + + return Path.Combine( + Dirs.NuGetPackages, + packageId, + _jitVersion); + } + + private string GetCoreLibsDirForVersion() + { + string coreclrRid = GetCoreCLRRid(); + + if (coreclrRid == null) + { + return null; + } + + string packageId = $"runtime.{coreclrRid}.Microsoft.NETCore.Runtime.CoreCLR"; + + return Path.Combine( + Dirs.NuGetPackages, + packageId, + _coreClrVersion, + "runtimes", + coreclrRid, + "lib", + "netstandard1.0"); + } private string GetCrossGenPackagePathForVersion() { @@ -73,7 +113,7 @@ namespace Microsoft.DotNet.Cli.Build return null; } - string packageId = $"runtime.{coreclrRid}.Microsoft.NETCore.Runtime.CoreCLR"; + string packageId = $"runtime.{coreclrRid}.Microsoft.NETCore.Runtime.CoreCLR"; return Path.Combine( Dirs.NuGetPackages, @@ -89,34 +129,23 @@ namespace Microsoft.DotNet.Cli.Build var arch = RuntimeEnvironment.RuntimeArchitecture; rid = $"win7-{arch}"; } - else if (CurrentPlatform.IsUbuntu) - { - rid = $"ubuntu.{RuntimeEnvironment.OperatingSystemVersion}-x64"; - } - else if (CurrentPlatform.IsCentOS || CurrentPlatform.IsRHEL) - { - // CentOS runtime is in the runtime.rhel.7-x64... package. - rid = "rhel.7-x64"; - } else if (CurrentPlatform.IsOSX) { rid = "osx.10.10-x64"; } - else if (CurrentPlatform.IsDebian) + else if (CurrentPlatform.IsCentOS || CurrentPlatform.IsRHEL) { - rid = "debian.8-x64"; + // CentOS runtime is in the runtime.rhel.7-x64... package as are all + // versions of RHEL + rid = "rhel.7-x64"; } - else if (CurrentPlatform.IsFedora) + else if (CurrentPlatform.IsLinux) { - rid = $"fedora.{RuntimeEnvironment.OperatingSystemVersion}-x64"; - } - else if (CurrentPlatform.IsOpenSuse) - { - rid = $"opensuse.{RuntimeEnvironment.OperatingSystemVersion}-x64"; + rid = RuntimeEnvironment.GetRuntimeIdentifier(); } return rid; - } + } public void CrossgenDirectory(string sharedFxPath, string pathToAssemblies) { @@ -137,10 +166,12 @@ namespace Microsoft.DotNet.Cli.Build // The right fix - // If the assembly has deps.json then parse the json file to get all the dependencies, pass these dependencies as input to crossgen. // else pass the current directory of assembly as input to crossgen. + var coreLibsDir = GetCoreLibsDirForVersion(); var addtionalPaths = Directory.GetDirectories(pathToAssemblies, "*", SearchOption.AllDirectories).ToList(); - var paths = new List() { sharedFxPath, pathToAssemblies }; + var paths = new List() { coreLibsDir, sharedFxPath, pathToAssemblies }; paths.AddRange(addtionalPaths); var platformAssembliesPaths = string.Join(Path.PathSeparator.ToString(), paths.Distinct()); + var jitPath = GetLibCLRJitPathForVersion(); var env = new Dictionary() { @@ -152,7 +183,7 @@ namespace Microsoft.DotNet.Cli.Build { string fileName = Path.GetFileName(file); - if (s_excludedLibraries.Any(lib => String.Equals(lib, fileName, StringComparison.OrdinalIgnoreCase)) + if (s_excludedLibraries.Any(lib => String.Equals(lib, fileName, StringComparison.OrdinalIgnoreCase)) || !PEUtils.HasMetadata(file)) { continue; @@ -165,11 +196,8 @@ namespace Microsoft.DotNet.Cli.Build "-platform_assemblies_paths", platformAssembliesPaths }; - if (CurrentPlatform.IsUnix) - { - crossgenArgs.Add("-JITPath"); - crossgenArgs.Add(GetLibCLRJitPathForVersion()); - } + crossgenArgs.Add("-JITPath"); + crossgenArgs.Add(jitPath); ExecSilent(_crossGenPath, crossgenArgs, env); diff --git a/build_projects/shared-build-targets-utils/Utils/SharedFrameworkPublisher.cs b/build_projects/shared-build-targets-utils/Utils/SharedFrameworkPublisher.cs index 57937cadb..67e522557 100644 --- a/build_projects/shared-build-targets-utils/Utils/SharedFrameworkPublisher.cs +++ b/build_projects/shared-build-targets-utils/Utils/SharedFrameworkPublisher.cs @@ -25,7 +25,7 @@ namespace Microsoft.DotNet.Cli.Build private string _corehostLockedDirectory; private string _corehostLatestDirectory; - private Crossgen _crossgenUtil = new Crossgen(DependencyVersions.CoreCLRVersion); + private Crossgen _crossgenUtil = new Crossgen(DependencyVersions.CoreCLRVersion, DependencyVersions.JitVersion); private string _corehostPackageSource; public SharedFrameworkPublisher( diff --git a/build_projects/update-dependencies/UpdateFilesTargets.cs b/build_projects/update-dependencies/UpdateFilesTargets.cs index a86943993..f29a2a133 100644 --- a/build_projects/update-dependencies/UpdateFilesTargets.cs +++ b/build_projects/update-dependencies/UpdateFilesTargets.cs @@ -212,6 +212,7 @@ namespace Microsoft.DotNet.Scripts ReplaceFileContents(@"build_projects\shared-build-targets-utils\DependencyVersions.cs", fileContents => { fileContents = ReplaceDependencyVersion(c, fileContents, "CoreCLRVersion", "Microsoft.NETCore.Runtime.CoreCLR"); + fileContents = ReplaceDependencyVersion(c, fileContents, "JitVersion", "Microsoft.NETCore.Jit"); return fileContents; }); From d2f1fa030048868aee55c18ccd0837c521391a79 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 7 Jun 2016 13:33:21 -0500 Subject: [PATCH 20/97] Updating CoreFx, CoreClr, CoreSetup to rc3-24207-03, rc3-24207-03, rc3-004415 respectively. --- .../project.json | 2 +- .../DesktopAppWithNativeDep/project.json | 2 +- .../KestrelDesktop/project.json | 2 +- .../KestrelDesktopForce32/project.json | 2 +- .../KestrelDesktopWithRuntimes/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../src/EmptyConsoleApp/project.json | 2 +- .../src/EmptyLibrary/project.json | 2 +- .../src/EmptyNetCoreApp/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../IncompatiblePackageSample/project.json | 2 +- .../src/Project1/project.json | 2 +- .../ToolWithOutputName/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../dotnet-desktop-and-portable/project.json | 2 +- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-portable/project.json | 2 +- .../TestApp1/project.json | 2 +- .../TestApp2/project.json | 2 +- .../AppWithBomGlobalJson/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithDirectDependency/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithOutputAssemblyName/project.json | 2 +- .../AppWithToolDependency/project.json | 2 +- .../TestProjects/CompileFail/project.json | 2 +- .../PortableApp_Standalone/project.json | 2 +- .../DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestAppDeps/project.json | 2 +- .../TestAppFullClr/project.json | 2 +- .../TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestProjects/EndToEndTestApp/project.json | 2 +- .../CompileFailApp/project.json | 2 +- .../FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../KestrelPortable/project.json | 2 +- .../KestrelStandalone/project.json | 2 +- .../project.json | 2 +- .../OutputStandardOutputAndError/project.json | 2 +- .../SingleTargetApp/project.json | 2 +- .../SingleTargetP0/project.json | 2 +- .../SingleTargetP1/project.json | 2 +- .../SingleTargetP2/project.json | 2 +- .../TwoTargetApp/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP0/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP1/project.json | 4 ++-- .../TwoTargetGraph/TwoTargetP2/project.json | 4 ++-- .../TwoTargetLargeP0/project.json | 6 +++--- .../TwoTargetLargeP1/project.json | 4 ++-- .../TwoTargetLargeP2/project.json | 4 ++-- .../TwoTargetLargeP3/project.json | 4 ++-- .../TwoTargetLargeP4/project.json | 4 ++-- .../TwoTargetLargeP5/project.json | 4 ++-- .../TwoTargetLargeP6/project.json | 4 ++-- .../PortableTests/PortableApp/project.json | 2 +- .../project.json | 2 +- .../PortableAppWithNative/project.json | 2 +- .../PortableTests/StandaloneApp/project.json | 2 +- .../MultipleFrameworkProject/project.json | 8 ++++---- .../NetCoreAppOnlyProject/project.json | 6 +++--- .../ResourcesTests/TestApp/project.json | 2 +- .../TestLibraryWithResources/project.json | 2 +- .../TestAppMultiTarget/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestProjects/TestAppSimple/project.json | 2 +- .../TestProjects/TestAppWithArgs/project.json | 2 +- .../App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestAppWithContentPackage/project.json | 2 +- .../TestAppWithContents/project.json | 2 +- .../TestAppWithLibrary/TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestAppWithResourceDeps/project.json | 12 +++++------ .../TestAppWithScripts/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../TestAppWithUnicodéPath/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../TestLibraryWithConfiguration/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../TestLibraryWithXmlDoc/project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 4 ++-- .../project.json | 6 +++--- .../TestMscorlibReference/project.json | 2 +- .../project.json | 2 +- .../src/L0/project.json | 2 +- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../project.json | 2 +- .../TestProjectWithResource/project.json | 2 +- .../TestLibraryWithRuleSet/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 2 +- .../TestSystemCoreReference/project.json | 2 +- .../TestSystemReference/project.json | 2 +- .../project.json | 6 +++--- .../dotnet-cli-build/CliDependencyVersions.cs | 4 ++-- build_projects/dotnet-cli-build/project.json | 14 ++++++------- .../DependencyVersions.cs | 4 ++-- .../shared-build-targets-utils/project.json | 12 +++++------ .../update-dependencies/project.json | 8 ++++---- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 6 +++--- .../project.json | 4 ++-- src/compilers/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- .../CSharp_Console/project.json.template | 2 +- .../FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 20 +++++++++---------- test/ArgumentForwardingTests/project.json | 4 ++-- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 4 ++-- test/Kestrel.Tests/project.json | 4 ++-- .../project.json | 6 +++--- .../project.json | 4 ++-- .../project.json | 2 +- .../project.json | 4 ++-- .../project.json | 4 ++-- test/Performance/project.json | 4 ++-- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 4 ++-- .../project.json | 6 +++--- .../TestAppWithFullPdbs/project.json | 2 +- .../TestAppWithPortablePdbs/project.json | 2 +- test/binding-redirects.Tests/project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 4 ++-- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 4 ++-- test/dotnet-compile.UnitTests/project.json | 4 ++-- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 6 +++--- .../project.json | 6 +++--- test/dotnet-publish.Tests/project.json | 6 +++--- test/dotnet-resgen.Tests/project.json | 4 ++-- test/dotnet-run.Tests/project.json | 4 ++-- test/dotnet-run.UnitTests/project.json | 4 ++-- test/dotnet-test.Tests/project.json | 8 ++++---- test/dotnet-test.UnitTests/project.json | 4 ++-- test/dotnet.Tests/project.json | 4 ++-- tools/MultiProjectValidator/project.json | 2 +- 164 files changed, 264 insertions(+), 264 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index 529be14db..7153da0bc 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } }, "imports": [ diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json index dc57867fa..ebeafb566 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "PackageWithFakeNativeDep": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24206-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24207-03" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json index c6360a360..1c5e74a8d 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24206-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24207-03" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json index a9cf0bd3d..d32ae04b5 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24206-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24207-03" }, "buildOptions": { "platform": "anycpu32bitpreferred", diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json index c207dc345..055d8c5fd 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24206-00" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24207-03" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json index f56b83bdc..c2859bb86 100644 --- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json @@ -9,7 +9,7 @@ "frameworks": { "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "imports": [ "portable-net45+win8", diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 801188afb..0c22df33e 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 02bcec5cf..a047d8338 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408", + "Microsoft.NETCore.App": "1.0.0-rc3-004415", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index 2eeac838a..ccbe21b01 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 813fc5ecc..52e53c3c1 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json @@ -5,7 +5,7 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index aa74f4021..84e7cc8fc 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index b5059852b..f2a1c82d6 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index ba7bba9dc..a09b8f779 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408", + "Microsoft.NETCore.App": "1.0.0-rc3-004415", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index 63e5c8ad3..04774b827 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index ad3db4851..18ca15755 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index 2cfca22f2..152b87d0e 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index 66cf4b74e..45109ca9a 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index 7ec34ed59..603528e96 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index 00dcdf4d7..c429680c2 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index ed1ca6df2..3fcfebc63 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 272371149..6afdbbfee 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index ec09d839d..2db9c9392 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index ca6544015..590ba5b31 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index 0b0f090ef..5e2e9f641 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index 840728a83..bb6563d59 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004408", + "version": "1.0.0-rc3-004415", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 80c4df3e6..548855b12 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408", + "Microsoft.NETCore.App": "1.0.0-rc3-004415", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index fdeaa525e..652259b73 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408", + "Microsoft.NETCore.App": "1.0.0-rc3-004415", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index 11b5c5d6c..cac99934d 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004408", + "version": "1.0.0-rc3-004415", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index 2cd48fd93..dadadea10 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004408", + "version": "1.0.0-rc3-004415", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 36f48b73e..112922c2a 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 75c733d05..0b2392044 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 6b7552531..357a083c3 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index ca6544015..590ba5b31 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index 53e095242..416296ab4 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 88e531a61..d1c659066 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -9,7 +9,7 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" } }, "net451": {} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index fc754d812..48417e84e 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408", + "Microsoft.NETCore.App": "1.0.0-rc3-004415", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index 447169eaf..d2646beee 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408", + "Microsoft.NETCore.App": "1.0.0-rc3-004415", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json index 28efeabce..79366dcab 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json @@ -7,7 +7,7 @@ "dependencies": { "DependencyContextValidator": "1.0.0-*", "System.Diagnostics.Process": { - "version": "4.1.0-rc3-24206-00", + "version": "4.1.0-rc3-24207-03", "type": "build" } }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 82066b923..fa951b918 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index 4e1a91371..54fb35638 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json index 70398cb11..7e85bc360 100644 --- a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json +++ b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json @@ -2,7 +2,7 @@ "version": "1.0.0", "dependencies": { "TestLibrary": "1.0.0", - "System.IO.Compression": "4.1.0-rc3-24206-00" + "System.IO.Compression": "4.1.0-rc3-24207-03" }, "frameworks": { "net461": {} diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index 5acf58b52..d71362589 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index 5aeebbaf6..770946bd3 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index d16664dd9..b4c4f796e 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004408", + "Microsoft.NETCore.App": "1.0.0-rc3-004415", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 9d08d5709..e088a2b40 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index be7c966b6..2e42f7c45 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index fa07e503b..23e52c577 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index 02530ac82..5dca6ff9e 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index 6bec4ccc9..89b23989b 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -3,7 +3,7 @@ "outputName": "MyLibrary" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 6b7552531..357a083c3 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index 3f8fabe7f..53a5fcb69 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index f6c2a5670..a064fe548 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index c2a6e4960..8d198d9cb 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index ff5cb813a..0f5b7e21a 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index bb6d55e54..7dc0ceda8 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,14 +9,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24207-03" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index c6aca8fd9..658ed585f 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24207-03" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index 1d04fcf04..3b45b5352 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index b0d7bf9f1..445f4ec40 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 2fa1a45da..fadb93150 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24207-03" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index 980dec8af..560afb369 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index 85ff6aa60..0cf35df18 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index 6c80127f1..54c9477d0 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index 31fd6c9d7..bb852b4cf 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index b0d7bf9f1..445f4ec40 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index b0d7bf9f1..445f4ec40 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index ae82019e8..7ff45aa80 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index 25223bf2b..0b24b3f9d 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 3391f7ef6..350649cc3 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index a33505995..a0fed8cbf 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index 16dc21a7f..0e92045e5 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24206-00", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24207-03", "xunit": "2.1.0" }, "frameworks": { @@ -15,10 +15,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Linq.Expressions": "4.1.0-rc3-24206-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00" + "System.Linq.Expressions": "4.1.0-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03" } }, "net451": {} diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index edf861d4a..f2e2a34b1 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Linq.Expressions": "4.1.0-rc3-24206-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Linq.Expressions": "4.1.0-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index e8fd9078d..480290ce1 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json index 8985b2345..ca71a9761 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 39cc4cd6b..c6ab8daff 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004408", + "version": "1.0.0-rc3-004415", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index e7190ecdc..372e031b3 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index 3ec965e1a..9052e12db 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index 6b7552531..357a083c3 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 6b7552531..357a083c3 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index f683103ef..d3412a4a3 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index d217b22c2..75de07229 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index f589f50e4..b9a28b003 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408", + "Microsoft.NETCore.App": "1.0.0-rc3-004415", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index ad53b0244..a80ef8e71 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index d979cb9dc..977715ae2 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index 3ec965e1a..9052e12db 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index e4fe38643..af7854437 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,12 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408", - "Microsoft.CSharp": "4.0.1-rc3-24206-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24206-00", - "System.Reflection.Metadata": "1.3.0-rc3-24206-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-24206-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004415", + "Microsoft.CSharp": "4.0.1-rc3-24207-03", + "System.Dynamic.Runtime": "4.0.11-rc3-24207-03", + "System.Reflection.Metadata": "1.3.0-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Xml.XmlSerializer": "4.0.11-rc3-24207-03", "WindowsAzure.Storage": "6.2.2-preview" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index e4c227b96..177f4a117 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index 47b3cea19..7493a09b0 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 8d2981cef..293231d65 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 248fb7e50..265304947 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json @@ -8,7 +8,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index 28e5514e0..2e68650be 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json @@ -5,7 +5,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index 6b7552531..357a083c3 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index d979cb9dc..977715ae2 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index b1cbf25d5..2914d7b00 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -7,7 +7,7 @@ "net451": {}, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 9cf10cace..b800321c9 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index e04c0aa42..a4cd1f1ed 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00", + "NETStandard.Library": "1.6.0-rc3-24207-03", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index 135db2068..32d8ce966 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json index 10fb85a8e..1f848a28f 100644 --- a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json +++ b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json @@ -5,7 +5,7 @@ }, "packInclude": {}, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index 0dfd3501f..be968784b 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json @@ -28,7 +28,7 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json index 72d61953b..1c781b1ac 100644 --- a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json +++ b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json @@ -4,7 +4,7 @@ "xmlDoc": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 75eb7a8c5..02f5b27cb 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,12 +5,12 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" } }, "net451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24206-00" + "Microsoft.CSharp": "4.0.1-rc3-24207-03" } } }, diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index 12abfd906..efb12cb6f 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,17 +5,17 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" } }, "netcore50": { "dependencies": { - "System.Private.Uri": "4.0.1-rc3-24206-00" + "System.Private.Uri": "4.0.1-rc3-24207-03" } }, "net99": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24206-00" + "Microsoft.CSharp": "4.0.1-rc3-24207-03" } } }, diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index ebdcb0937..e1df6b2a6 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index 318dc9c22..d8721f0a8 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004408", + "version": "1.0.0-rc3-004415", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 1f721494e..7e61552e5 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index 2e6d7a5d4..d3d56fadf 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -3,7 +3,7 @@ "dependencies": { "L12": "1.0.0-*", "L21": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index a17f56f12..076952661 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 8985b2345..ca71a9761 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 8985b2345..ca71a9761 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 6b7552531..357a083c3 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 6b7552531..357a083c3 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json index 352a303c6..4844702cd 100644 --- a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json +++ b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json @@ -6,7 +6,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00", + "NETStandard.Library": "1.6.0-rc3-24207-03", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index d89c25b21..076d7fbaa 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index 68f7aebe1..9d9c6b45d 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index c12c2affd..0246b57e3 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408" + "Microsoft.NETCore.App": "1.0.0-rc3-004415" } }, "net451": { diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json index c3382944d..a0799a1b2 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -10,9 +10,9 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00", - "System.Diagnostics.Process": "4.1.0-rc3-24206-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03", + "System.Diagnostics.Process": "4.1.0-rc3-24207-03", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index 639d289c0..b5adae305 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004408"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004408-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004415"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004415-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 4870103e1..a48b6c612 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -5,13 +5,13 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24206-00", - "Microsoft.CSharp": "4.0.1-rc3-24206-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24206-00", - "System.Reflection.Metadata": "1.3.0-rc3-24206-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-24206-00", + "NETStandard.Library": "1.6.0-rc3-24207-03", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24207-03", + "Microsoft.CSharp": "4.0.1-rc3-24207-03", + "System.Dynamic.Runtime": "4.0.11-rc3-24207-03", + "System.Reflection.Metadata": "1.3.0-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Xml.XmlSerializer": "4.0.11-rc3-24207-03", "WindowsAzure.Storage": "6.2.2-preview", "NuGet.CommandLine.XPlat": "3.5.0-beta2-1392", "Microsoft.DotNet.Cli.Build.Framework": { diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 15193a4c1..848701e83 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "1.0.2-rc3-24206-00"; - public static readonly string JitVersion = "1.0.2-rc3-24206-00"; + public static readonly string CoreCLRVersion = "1.0.2-rc3-24207-03"; + public static readonly string JitVersion = "1.0.2-rc3-24207-03"; } } diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json index a9035853e..8942b334d 100644 --- a/build_projects/shared-build-targets-utils/project.json +++ b/build_projects/shared-build-targets-utils/project.json @@ -2,12 +2,12 @@ "version": "1.0.0-*", "description": "Build scripts for dotnet-cli", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00", - "Microsoft.CSharp": "4.0.1-rc3-24206-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24206-00", - "System.Reflection.Metadata": "1.3.0-rc3-24206-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-24206-00", + "NETStandard.Library": "1.6.0-rc3-24207-03", + "Microsoft.CSharp": "4.0.1-rc3-24207-03", + "System.Dynamic.Runtime": "4.0.11-rc3-24207-03", + "System.Reflection.Metadata": "1.3.0-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Xml.XmlSerializer": "4.0.11-rc3-24207-03", "WindowsAzure.Storage": "6.2.2-preview", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 79bd9b2d6..fe23003e4 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -5,10 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00", - "Microsoft.CSharp": "4.0.1-rc3-24206-00", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24206-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "NETStandard.Library": "1.6.0-rc3-24207-03", + "Microsoft.CSharp": "4.0.1-rc3-24207-03", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 3d4c485a0..e657176c5 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -26,7 +26,7 @@ "portable-net45+wp80+win8+wpa81+dnxcore50" ], "dependencies": { - "System.Diagnostics.Process": "4.1.0-rc3-24206-00" + "System.Diagnostics.Process": "4.1.0-rc3-24207-03" } } } diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 60b46ff3b..3cfeffeea 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Linq.Expressions": "4.1.0-rc3-24206-00" + "System.Linq.Expressions": "4.1.0-rc3-24207-03" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index d62158440..03ecd1147 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -10,14 +10,14 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.AppContext": "4.1.0-rc3-24206-00", - "System.Collections": "4.0.11-rc3-24206-00", - "System.IO": "4.1.0-rc3-24206-00", - "System.IO.FileSystem": "4.0.1-rc3-24206-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24206-00", - "System.Runtime.Extensions": "4.1.0-rc3-24206-00", - "System.Runtime.InteropServices": "4.1.0-rc3-24206-00", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24206-00" + "System.AppContext": "4.1.0-rc3-24207-03", + "System.Collections": "4.0.11-rc3-24207-03", + "System.IO": "4.1.0-rc3-24207-03", + "System.IO.FileSystem": "4.0.1-rc3-24207-03", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24207-03", + "System.Runtime.Extensions": "4.1.0-rc3-24207-03", + "System.Runtime.InteropServices": "4.1.0-rc3-24207-03", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24207-03" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 174795b36..bf5994e50 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -7,7 +7,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Runtime.Loader": "4.0.0-rc3-24206-00" + "System.Runtime.Loader": "4.0.0-rc3-24207-03" }, "frameworks": { "netstandard1.6": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 5425752cf..57e5eaef3 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -11,7 +11,7 @@ "Newtonsoft.Json": "9.0.1-beta1", "NuGet.Packaging": "3.5.0-beta2-1392", "NuGet.RuntimeModel": "3.5.0-beta2-1392", - "System.Reflection.Metadata": "1.3.0-rc3-24206-00" + "System.Reflection.Metadata": "1.3.0-rc3-24207-03" }, "frameworks": { "net451": { @@ -33,13 +33,13 @@ "dotnet5.4" ], "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24206-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24206-00", - "System.Runtime.Loader": "4.0.0-rc3-24206-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", - "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24206-00", - "System.Threading.Thread": "4.0.0-rc3-24206-00", - "System.Xml.XDocument": "4.0.11-rc3-24206-00" + "Microsoft.CSharp": "4.0.1-rc3-24207-03", + "System.Dynamic.Runtime": "4.0.11-rc3-24207-03", + "System.Runtime.Loader": "4.0.0-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24207-03", + "System.Threading.Thread": "4.0.0-rc3-24207-03", + "System.Xml.XDocument": "4.0.11-rc3-24207-03" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 81fe54b52..6a9170412 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -16,9 +16,9 @@ "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { - "System.Diagnostics.Debug": "4.0.11-rc3-24206-00", - "System.Dynamic.Runtime": "4.0.11-rc3-24206-00", - "System.Linq": "4.1.0-rc3-24206-00" + "System.Diagnostics.Debug": "4.0.11-rc3-24207-03", + "System.Dynamic.Runtime": "4.0.11-rc3-24207-03", + "System.Linq": "4.1.0-rc3-24207-03" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 262216fa3..58981ef1e 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -22,8 +22,8 @@ "portable-net45+win8" ], "dependencies": { - "System.Resources.ResourceManager": "4.0.1-rc3-24206-00", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24206-00" + "System.Resources.ResourceManager": "4.0.1-rc3-24207-03", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24207-03" } } }, diff --git a/src/compilers/project.json b/src/compilers/project.json index 10db43eab..2de739d57 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160606-02", "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160606-02", diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index e785e27f6..8d34aed6d 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index ef53c8892..bd0b0d7e3 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index f438c4f9c..8df4668e9 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index ba11a9dda..3a1595060 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -26,8 +26,8 @@ }, "NuGet.CommandLine.XPlat": "3.5.0-beta2-1392", "Newtonsoft.Json": "9.0.1-beta1", - "System.Text.Encoding.CodePages": "4.0.1-rc3-24206-00", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24206-00", + "System.Text.Encoding.CodePages": "4.0.1-rc3-24207-03", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24207-03", "Microsoft.ApplicationInsights": "2.0.0", "Microsoft.DotNet.ProjectModel": { "target": "project" @@ -43,16 +43,16 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24206-00", - "System.Resources.Writer": "4.0.0-rc3-24206-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", - "System.Private.DataContractSerialization": "4.1.1-rc3-24206-00", - "System.Text.RegularExpressions": "4.1.0-rc3-24206-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24207-03", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24207-03", + "System.Resources.Writer": "4.0.0-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Private.DataContractSerialization": "4.1.1-rc3-24207-03", + "System.Text.RegularExpressions": "4.1.0-rc3-24207-03", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24206-00", + "version": "4.0.0-rc3-24207-03", "exclude": "compile" } }, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 1f1787b60..5e5527128 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 1228e2154..9ffaba739 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index af96c7cc7..b1244844c 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index 4f834cac9..b8b9e2fef 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 5808417b6..98cca3f38 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,10 +16,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "NuGet.Versioning": "3.5.0-beta2-1392", "NuGet.Packaging": "3.5.0-beta2-1392", "NuGet.Frameworks": "3.5.0-beta2-1392", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 180d61053..06e33b4d4 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json index 8778780b2..a81c05735 100644 --- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.DotNet.ProjectModel.Loader": { "target": "project" diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index abe2c8936..581ff832f 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,9 +11,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 866d02b62..884fcb9d2 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,9 +7,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24206-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24207-03", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Performance/project.json b/test/Performance/project.json index 5d3e6b6f8..243c8d3de 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 8288dc8d5..b002866de 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index c04f25dac..b42d25f8a 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,12 +3,12 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index 6d2140950..9d4acb363 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,13 +3,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", - "System.Diagnostics.Process": "4.1.0-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Diagnostics.Process": "4.1.0-rc3-24207-03", "TestAppWithPortablePdbs": { "target": "project" }, diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index d1080f730..c487a64bd 100644 --- a/test/TestingAbstractions/TestAppWithFullPdbs/project.json +++ b/test/TestingAbstractions/TestAppWithFullPdbs/project.json @@ -4,7 +4,7 @@ "debugType": "full" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": {} diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index 645a24729..eddb42577 100644 --- a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json +++ b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24206-00" + "NETStandard.Library": "1.6.0-rc3-24207-03" }, "frameworks": { "netstandard1.5": {} diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json index d5743a9cc..886a01d54 100644 --- a/test/binding-redirects.Tests/project.json +++ b/test/binding-redirects.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24206-00", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24207-03", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" } diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index 32b3df01e..e308daec8 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index b8ab8b0cd..7e4f32c25 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index c63a936ab..2abc98899 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index f79302266..1ca1fa1bc 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 85d2f3e48..706472e34 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -23,7 +23,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24206-00", + "version": "4.0.0-rc3-24207-03", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index 767ea22d5..d9459537a 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 17fc73adc..3b519e6e9 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", - "System.IO.Compression.ZipFile": "4.0.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.IO.Compression.ZipFile": "4.0.1-rc3-24207-03", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index ec3cc9636..38f78d82f 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,13 +2,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24206-00", + "version": "4.0.0-rc3-24207-03", "exclude": "Compile" }, "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -19,7 +19,7 @@ }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Net.NameResolution": "4.0.0-rc3-24206-00" + "System.Net.NameResolution": "4.0.0-rc3-24207-03" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index e51f14752..d2059cb36 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.TestFramework": { "target": "project" }, @@ -15,7 +15,7 @@ "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00206", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24206-00" + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24207-03" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index d088f0590..da22c1abd 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 4f834cac9..b8b9e2fef 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index eec2b84d6..0ed15dee4 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 4b6ea6f34..fb28deca1 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Newtonsoft.Json": "9.0.1-beta1", "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -15,9 +15,9 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc3-24206-00", - "System.Net.Sockets": "4.1.0-rc3-24206-00", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Net.NameResolution": "4.0.0-rc3-24207-03", + "System.Net.Sockets": "4.1.0-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 85fc1484b..56320a94a 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,14 +3,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, "Newtonsoft.Json": "9.0.1-beta1", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24206-00", + "version": "4.0.0-rc3-24207-03", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 849214684..51f5122aa 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004408" + "version": "1.0.0-rc3-004415" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24206-00", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 03d87a34e..26360eba2 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004408", + "Microsoft.NETCore.App": "1.0.0-rc3-004415", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From 71d39a4a199d14eef8c89a05b256f59468817595 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 8 Jun 2016 12:01:35 -0500 Subject: [PATCH 21/97] Update Microsoft.DiaSymReader.Native to 1.4.0-rc2 --- src/Microsoft.Extensions.Testing.Abstractions/project.json | 2 +- src/compilers/project.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 58981ef1e..ffd547795 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -12,7 +12,7 @@ "target": "project" }, "Microsoft.DiaSymReader": "1.0.8-rc2-60606-01", - "Microsoft.DiaSymReader.Native": "1.4.0-rc" + "Microsoft.DiaSymReader.Native": "1.4.0-rc2" }, "frameworks": { "net451": {}, diff --git a/src/compilers/project.json b/src/compilers/project.json index 2de739d57..ab0fe557f 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -10,7 +10,7 @@ }, "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160606-02", "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160606-02", - "Microsoft.DiaSymReader.Native": "1.4.0-rc" + "Microsoft.DiaSymReader.Native": "1.4.0-rc2" }, "frameworks": { "netcoreapp1.0": { From 4a88cff1858389960a78ae82c13165f95fad1cd4 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Fri, 27 May 2016 12:37:17 -0700 Subject: [PATCH 22/97] [Fixes #3255] Added a web template to dotnet new --- .gitignore | 3 + .../dotnet-cli-build/PrepareTargets.cs | 38 +- .../update-dependencies/UpdateFilesTargets.cs | 3 +- src/dotnet/README.md | 2 +- .../commands/dotnet-new/CSharp_Web/.bowerrc | 3 + .../commands/dotnet-new/CSharp_Web/.gitignore | 234 +++++++++ .../Controllers/AccountController.cs | 468 ++++++++++++++++++ .../CSharp_Web/Controllers/HomeController.cs | 35 ++ .../Controllers/ManageController.cs | 347 +++++++++++++ .../CSharp_Web/Data/ApplicationDbContext.cs | 26 + ...000000000_CreateIdentitySchema.Designer.cs | 212 ++++++++ .../00000000000000_CreateIdentitySchema.cs | 215 ++++++++ .../ApplicationDbContextModelSnapshot.cs | 211 ++++++++ .../ExternalLoginConfirmationViewModel.cs | 15 + .../ForgotPasswordViewModel.cs | 15 + .../AccountViewModels/LoginViewModel.cs | 22 + .../AccountViewModels/RegisterViewModel.cs | 27 + .../ResetPasswordViewModel.cs | 27 + .../AccountViewModels/SendCodeViewModel.cs | 19 + .../AccountViewModels/VerifyCodeViewModel.cs | 25 + .../CSharp_Web/Models/ApplicationUser.cs | 13 + .../AddPhoneNumberViewModel.cs | 16 + .../ChangePasswordViewModel.cs | 27 + .../ConfigureTwoFactorViewModel.cs | 15 + .../ManageViewModels/FactorViewModel.cs | 12 + .../Models/ManageViewModels/IndexViewModel.cs | 21 + .../ManageViewModels/ManageLoginsViewModel.cs | 16 + .../ManageViewModels/RemoveLoginViewModel.cs | 14 + .../ManageViewModels/SetPasswordViewModel.cs | 22 + .../VerifyPhoneNumberViewModel.cs | 19 + .../commands/dotnet-new/CSharp_Web/Program.cs | 24 + .../commands/dotnet-new/CSharp_Web/README.md | 39 ++ .../CSharp_Web/Services/IEmailSender.cs | 12 + .../CSharp_Web/Services/ISmsSender.cs | 12 + .../CSharp_Web/Services/MessageServices.cs | 25 + .../commands/dotnet-new/CSharp_Web/Startup.cs | 88 ++++ .../Views/Account/ConfirmEmail.cshtml | 10 + .../Account/ExternalLoginConfirmation.cshtml | 35 ++ .../Views/Account/ExternalLoginFailure.cshtml | 8 + .../Views/Account/ForgotPassword.cshtml | 31 ++ .../Account/ForgotPasswordConfirmation.cshtml | 8 + .../CSharp_Web/Views/Account/Lockout.cshtml | 8 + .../CSharp_Web/Views/Account/Login.cshtml | 92 ++++ .../CSharp_Web/Views/Account/Register.cshtml | 42 ++ .../Views/Account/ResetPassword.cshtml | 43 ++ .../Account/ResetPasswordConfirmation.cshtml | 8 + .../CSharp_Web/Views/Account/SendCode.cshtml | 21 + .../Views/Account/VerifyCode.cshtml | 38 ++ .../CSharp_Web/Views/Home/About.cshtml | 7 + .../CSharp_Web/Views/Home/Contact.cshtml | 17 + .../CSharp_Web/Views/Home/Index.cshtml | 109 ++++ .../Views/Manage/AddPhoneNumber.cshtml | 27 + .../Views/Manage/ChangePassword.cshtml | 42 ++ .../CSharp_Web/Views/Manage/Index.cshtml | 71 +++ .../Views/Manage/ManageLogins.cshtml | 54 ++ .../Views/Manage/SetPassword.cshtml | 38 ++ .../Views/Manage/VerifyPhoneNumber.cshtml | 30 ++ .../CSharp_Web/Views/Shared/Error.cshtml | 14 + .../CSharp_Web/Views/Shared/_Layout.cshtml | 68 +++ .../Views/Shared/_LoginPartial.cshtml | 26 + .../Shared/_ValidationScriptsPartial.cshtml | 14 + .../CSharp_Web/Views/_ViewImports.cshtml | 6 + .../CSharp_Web/Views/_ViewStart.cshtml | 3 + .../dotnet-new/CSharp_Web/appsettings.json | 13 + .../commands/dotnet-new/CSharp_Web/bower.json | 10 + .../dotnet-new/CSharp_Web/gulpfile.js | 45 ++ .../dotnet-new/CSharp_Web/package.json | 12 + .../CSharp_Web/project.json.template | 110 ++++ .../commands/dotnet-new/CSharp_Web/web.config | 14 + .../CSharp_Web/wwwroot/css/site.css | 44 ++ .../CSharp_Web/wwwroot/css/site.min.css | 1 + .../dotnet-new/CSharp_Web/wwwroot/favicon.ico | Bin 0 -> 32038 bytes .../CSharp_Web/wwwroot/images/banner1.svg | 1 + .../CSharp_Web/wwwroot/images/banner2.svg | 1 + .../CSharp_Web/wwwroot/images/banner3.svg | 1 + .../CSharp_Web/wwwroot/images/banner4.svg | 1 + .../dotnet-new/CSharp_Web/wwwroot/js/site.js | 1 + .../CSharp_Web/wwwroot/js/site.min.js | 0 src/dotnet/commands/dotnet-new/Program.cs | 40 +- src/dotnet/commands/dotnet-new/README.md | 2 +- src/dotnet/project.json | 12 +- 81 files changed, 3459 insertions(+), 41 deletions(-) create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/.bowerrc create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/.gitignore create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Controllers/AccountController.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Controllers/HomeController.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Controllers/ManageController.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Data/ApplicationDbContext.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Data/Migrations/00000000000000_CreateIdentitySchema.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Data/Migrations/ApplicationDbContextModelSnapshot.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/ForgotPasswordViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/LoginViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/RegisterViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/ResetPasswordViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/SendCodeViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/VerifyCodeViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/ApplicationUser.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/AddPhoneNumberViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/ChangePasswordViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/FactorViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/IndexViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/ManageLoginsViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/RemoveLoginViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/SetPasswordViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Program.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/README.md create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Services/IEmailSender.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Services/ISmsSender.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Services/MessageServices.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Startup.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ConfirmEmail.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ExternalLoginConfirmation.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ExternalLoginFailure.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ForgotPassword.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ForgotPasswordConfirmation.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/Lockout.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/Login.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/Register.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ResetPassword.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ResetPasswordConfirmation.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/SendCode.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/VerifyCode.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Home/About.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Home/Contact.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Home/Index.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/AddPhoneNumber.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/ChangePassword.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/Index.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/ManageLogins.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/SetPassword.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/VerifyPhoneNumber.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/Error.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/_Layout.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/_LoginPartial.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/_ValidationScriptsPartial.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/_ViewImports.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/Views/_ViewStart.cshtml create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/appsettings.json create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/bower.json create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/gulpfile.js create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/package.json create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/web.config create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/css/site.css create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/css/site.min.css create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/favicon.ico create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner1.svg create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner2.svg create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner3.svg create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner4.svg create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/js/site.js create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/js/site.min.js diff --git a/.gitignore b/.gitignore index 193640562..cca89b49e 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,9 @@ cmake/ # stage0 install directory .dotnet_stage0 +# `dotnet new` template zip files are generated by a pre-build step. +/src/dotnet/commands/dotnet-new/*.zip + ### VisualStudio.gitignore from https://raw.githubusercontent.com/github/gitignore/master/VisualStudio.gitignore ### ## Ignore Visual Studio temporary files, build results, and diff --git a/build_projects/dotnet-cli-build/PrepareTargets.cs b/build_projects/dotnet-cli-build/PrepareTargets.cs index b31827060..4353addbf 100644 --- a/build_projects/dotnet-cli-build/PrepareTargets.cs +++ b/build_projects/dotnet-cli-build/PrepareTargets.cs @@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Cli.Build { public class PrepareTargets { - [Target(nameof(Init), nameof(DownloadHostAndSharedFxArtifacts), nameof(RestorePackages))] + [Target(nameof(Init), nameof(DownloadHostAndSharedFxArtifacts), nameof(RestorePackages), nameof(ZipTemplates))] public static BuildTargetResult Prepare(BuildTargetContext c) => c.Success(); [Target(nameof(CheckPrereqCmakePresent), nameof(CheckPlatformDependencies))] @@ -35,9 +35,9 @@ namespace Microsoft.DotNet.Cli.Build // All major targets will depend on this in order to ensure variables are set up right if they are run independently [Target( - nameof(GenerateVersions), - nameof(CheckPrereqs), - nameof(LocateStage0), + nameof(GenerateVersions), + nameof(CheckPrereqs), + nameof(LocateStage0), nameof(ExpectedBuildArtifacts), nameof(SetTelemetryProfile))] public static BuildTargetResult Init(BuildTargetContext c) @@ -75,7 +75,7 @@ namespace Microsoft.DotNet.Cli.Build ReleaseSuffix = branchInfo["RELEASE_SUFFIX"], CommitCount = commitCount }; - + c.BuildContext["BuildVersion"] = buildVersion; c.BuildContext["CommitHash"] = commitHash; @@ -86,6 +86,26 @@ namespace Microsoft.DotNet.Cli.Build return c.Success(); } + [Target] + public static BuildTargetResult ZipTemplates(BuildTargetContext c) + { + var templateDirectories = Directory.GetDirectories( + Path.Combine(Dirs.RepoRoot, "src", "dotnet", "commands", "dotnet-new")); + + foreach (var directory in templateDirectories) + { + var zipFile = Path.Combine(Path.GetDirectoryName(directory), Path.GetFileName(directory) + ".zip"); + if (File.Exists(zipFile)) + { + File.Delete(zipFile); + } + + ZipFile.CreateFromDirectory(directory, zipFile); + } + + return c.Success(); + } + [Target] public static BuildTargetResult LocateStage0(BuildTargetContext c) { @@ -137,8 +157,8 @@ namespace Microsoft.DotNet.Cli.Build } [Target( - nameof(ExpectedBuildArtifacts), - nameof(DownloadHostAndSharedFxArchives), + nameof(ExpectedBuildArtifacts), + nameof(DownloadHostAndSharedFxArchives), nameof(DownloadHostAndSharedFxInstallers))] public static BuildTargetResult DownloadHostAndSharedFxArtifacts(BuildTargetContext c) => c.Success(); @@ -487,8 +507,8 @@ cmake is required to build the native host 'corehost'"; } private static void AddInstallerArtifactToContext( - BuildTargetContext c, - string artifactPrefix, + BuildTargetContext c, + string artifactPrefix, string contextPrefix, string version) { diff --git a/build_projects/update-dependencies/UpdateFilesTargets.cs b/build_projects/update-dependencies/UpdateFilesTargets.cs index f29a2a133..1156c0b2e 100644 --- a/build_projects/update-dependencies/UpdateFilesTargets.cs +++ b/build_projects/update-dependencies/UpdateFilesTargets.cs @@ -93,7 +93,8 @@ namespace Microsoft.DotNet.Scripts IEnumerable projectJsonFiles = Enumerable.Union( Directory.GetFiles(Dirs.RepoRoot, "project.json", SearchOption.AllDirectories), Directory.GetFiles(Path.Combine(Dirs.RepoRoot, @"src\dotnet\commands\dotnet-new"), "project.json.template", SearchOption.AllDirectories)) - .Where(p => !File.Exists(Path.Combine(Path.GetDirectoryName(p), noUpdateFileName))); + .Where(p => !File.Exists(Path.Combine(Path.GetDirectoryName(p), noUpdateFileName)) && + !Path.GetDirectoryName(p).EndsWith("CSharp_Web", StringComparison.Ordinal)); JObject projectRoot; foreach (string projectJsonFile in projectJsonFiles) diff --git a/src/dotnet/README.md b/src/dotnet/README.md index 4675e732c..bbfd423f9 100644 --- a/src/dotnet/README.md +++ b/src/dotnet/README.md @@ -65,7 +65,7 @@ The following commands exist for dotnet. `dotnet new` - Initializes a sample .NET Core console application that can be compiled and ran. + Initializes sample applications that can be compiled and run. `dotnet restore` diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/.bowerrc b/src/dotnet/commands/dotnet-new/CSharp_Web/.bowerrc new file mode 100644 index 000000000..6406626ab --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "wwwroot/lib" +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/.gitignore b/src/dotnet/commands/dotnet-new/CSharp_Web/.gitignore new file mode 100644 index 000000000..0ca27f04e --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/.gitignore @@ -0,0 +1,234 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +build/ +bld/ +[Bb]in/ +[Oo]bj/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Microsoft Azure ApplicationInsights config file +ApplicationInsights.config + +# Windows Store app package directory +AppPackages/ +BundleArtifacts/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe + +# FAKE - F# Make +.fake/ diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Controllers/AccountController.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Controllers/AccountController.cs new file mode 100644 index 000000000..035638af9 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Controllers/AccountController.cs @@ -0,0 +1,468 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Claims; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Rendering; +using Microsoft.Extensions.Logging; +using WebApplication.Models; +using WebApplication.Models.AccountViewModels; +using WebApplication.Services; + +namespace WebApplication.Controllers +{ + [Authorize] + public class AccountController : Controller + { + private readonly UserManager _userManager; + private readonly SignInManager _signInManager; + private readonly IEmailSender _emailSender; + private readonly ISmsSender _smsSender; + private readonly ILogger _logger; + + public AccountController( + UserManager userManager, + SignInManager signInManager, + IEmailSender emailSender, + ISmsSender smsSender, + ILoggerFactory loggerFactory) + { + _userManager = userManager; + _signInManager = signInManager; + _emailSender = emailSender; + _smsSender = smsSender; + _logger = loggerFactory.CreateLogger(); + } + + // + // GET: /Account/Login + [HttpGet] + [AllowAnonymous] + public IActionResult Login(string returnUrl = null) + { + ViewData["ReturnUrl"] = returnUrl; + return View(); + } + + // + // POST: /Account/Login + [HttpPost] + [AllowAnonymous] + [ValidateAntiForgeryToken] + public async Task Login(LoginViewModel model, string returnUrl = null) + { + ViewData["ReturnUrl"] = returnUrl; + if (ModelState.IsValid) + { + // This doesn't count login failures towards account lockout + // To enable password failures to trigger account lockout, set lockoutOnFailure: true + var result = await _signInManager.PasswordSignInAsync(model.Email, model.Password, model.RememberMe, lockoutOnFailure: false); + if (result.Succeeded) + { + _logger.LogInformation(1, "User logged in."); + return RedirectToLocal(returnUrl); + } + if (result.RequiresTwoFactor) + { + return RedirectToAction(nameof(SendCode), new { ReturnUrl = returnUrl, RememberMe = model.RememberMe }); + } + if (result.IsLockedOut) + { + _logger.LogWarning(2, "User account locked out."); + return View("Lockout"); + } + else + { + ModelState.AddModelError(string.Empty, "Invalid login attempt."); + return View(model); + } + } + + // If we got this far, something failed, redisplay form + return View(model); + } + + // + // GET: /Account/Register + [HttpGet] + [AllowAnonymous] + public IActionResult Register(string returnUrl = null) + { + ViewData["ReturnUrl"] = returnUrl; + return View(); + } + + // + // POST: /Account/Register + [HttpPost] + [AllowAnonymous] + [ValidateAntiForgeryToken] + public async Task Register(RegisterViewModel model, string returnUrl = null) + { + ViewData["ReturnUrl"] = returnUrl; + if (ModelState.IsValid) + { + var user = new ApplicationUser { UserName = model.Email, Email = model.Email }; + var result = await _userManager.CreateAsync(user, model.Password); + if (result.Succeeded) + { + // For more information on how to enable account confirmation and password reset please visit https://go.microsoft.com/fwlink/?LinkID=532713 + // Send an email with this link + //var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); + //var callbackUrl = Url.Action("ConfirmEmail", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme); + //await _emailSender.SendEmailAsync(model.Email, "Confirm your account", + // $"Please confirm your account by clicking this link: link"); + await _signInManager.SignInAsync(user, isPersistent: false); + _logger.LogInformation(3, "User created a new account with password."); + return RedirectToLocal(returnUrl); + } + AddErrors(result); + } + + // If we got this far, something failed, redisplay form + return View(model); + } + + // + // POST: /Account/LogOff + [HttpPost] + [ValidateAntiForgeryToken] + public async Task LogOff() + { + await _signInManager.SignOutAsync(); + _logger.LogInformation(4, "User logged out."); + return RedirectToAction(nameof(HomeController.Index), "Home"); + } + + // + // POST: /Account/ExternalLogin + [HttpPost] + [AllowAnonymous] + [ValidateAntiForgeryToken] + public IActionResult ExternalLogin(string provider, string returnUrl = null) + { + // Request a redirect to the external login provider. + var redirectUrl = Url.Action("ExternalLoginCallback", "Account", new { ReturnUrl = returnUrl }); + var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl); + return Challenge(properties, provider); + } + + // + // GET: /Account/ExternalLoginCallback + [HttpGet] + [AllowAnonymous] + public async Task ExternalLoginCallback(string returnUrl = null, string remoteError = null) + { + if (remoteError != null) + { + ModelState.AddModelError(string.Empty, $"Error from external provider: {remoteError}"); + return View(nameof(Login)); + } + var info = await _signInManager.GetExternalLoginInfoAsync(); + if (info == null) + { + return RedirectToAction(nameof(Login)); + } + + // Sign in the user with this external login provider if the user already has a login. + var result = await _signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKey, isPersistent: false); + if (result.Succeeded) + { + _logger.LogInformation(5, "User logged in with {Name} provider.", info.LoginProvider); + return RedirectToLocal(returnUrl); + } + if (result.RequiresTwoFactor) + { + return RedirectToAction(nameof(SendCode), new { ReturnUrl = returnUrl }); + } + if (result.IsLockedOut) + { + return View("Lockout"); + } + else + { + // If the user does not have an account, then ask the user to create an account. + ViewData["ReturnUrl"] = returnUrl; + ViewData["LoginProvider"] = info.LoginProvider; + var email = info.Principal.FindFirstValue(ClaimTypes.Email); + return View("ExternalLoginConfirmation", new ExternalLoginConfirmationViewModel { Email = email }); + } + } + + // + // POST: /Account/ExternalLoginConfirmation + [HttpPost] + [AllowAnonymous] + [ValidateAntiForgeryToken] + public async Task ExternalLoginConfirmation(ExternalLoginConfirmationViewModel model, string returnUrl = null) + { + if (ModelState.IsValid) + { + // Get the information about the user from the external login provider + var info = await _signInManager.GetExternalLoginInfoAsync(); + if (info == null) + { + return View("ExternalLoginFailure"); + } + var user = new ApplicationUser { UserName = model.Email, Email = model.Email }; + var result = await _userManager.CreateAsync(user); + if (result.Succeeded) + { + result = await _userManager.AddLoginAsync(user, info); + if (result.Succeeded) + { + await _signInManager.SignInAsync(user, isPersistent: false); + _logger.LogInformation(6, "User created an account using {Name} provider.", info.LoginProvider); + return RedirectToLocal(returnUrl); + } + } + AddErrors(result); + } + + ViewData["ReturnUrl"] = returnUrl; + return View(model); + } + + // GET: /Account/ConfirmEmail + [HttpGet] + [AllowAnonymous] + public async Task ConfirmEmail(string userId, string code) + { + if (userId == null || code == null) + { + return View("Error"); + } + var user = await _userManager.FindByIdAsync(userId); + if (user == null) + { + return View("Error"); + } + var result = await _userManager.ConfirmEmailAsync(user, code); + return View(result.Succeeded ? "ConfirmEmail" : "Error"); + } + + // + // GET: /Account/ForgotPassword + [HttpGet] + [AllowAnonymous] + public IActionResult ForgotPassword() + { + return View(); + } + + // + // POST: /Account/ForgotPassword + [HttpPost] + [AllowAnonymous] + [ValidateAntiForgeryToken] + public async Task ForgotPassword(ForgotPasswordViewModel model) + { + if (ModelState.IsValid) + { + var user = await _userManager.FindByNameAsync(model.Email); + if (user == null || !(await _userManager.IsEmailConfirmedAsync(user))) + { + // Don't reveal that the user does not exist or is not confirmed + return View("ForgotPasswordConfirmation"); + } + + // For more information on how to enable account confirmation and password reset please visit https://go.microsoft.com/fwlink/?LinkID=532713 + // Send an email with this link + //var code = await _userManager.GeneratePasswordResetTokenAsync(user); + //var callbackUrl = Url.Action("ResetPassword", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme); + //await _emailSender.SendEmailAsync(model.Email, "Reset Password", + // $"Please reset your password by clicking here: link"); + //return View("ForgotPasswordConfirmation"); + } + + // If we got this far, something failed, redisplay form + return View(model); + } + + // + // GET: /Account/ForgotPasswordConfirmation + [HttpGet] + [AllowAnonymous] + public IActionResult ForgotPasswordConfirmation() + { + return View(); + } + + // + // GET: /Account/ResetPassword + [HttpGet] + [AllowAnonymous] + public IActionResult ResetPassword(string code = null) + { + return code == null ? View("Error") : View(); + } + + // + // POST: /Account/ResetPassword + [HttpPost] + [AllowAnonymous] + [ValidateAntiForgeryToken] + public async Task ResetPassword(ResetPasswordViewModel model) + { + if (!ModelState.IsValid) + { + return View(model); + } + var user = await _userManager.FindByNameAsync(model.Email); + if (user == null) + { + // Don't reveal that the user does not exist + return RedirectToAction(nameof(AccountController.ResetPasswordConfirmation), "Account"); + } + var result = await _userManager.ResetPasswordAsync(user, model.Code, model.Password); + if (result.Succeeded) + { + return RedirectToAction(nameof(AccountController.ResetPasswordConfirmation), "Account"); + } + AddErrors(result); + return View(); + } + + // + // GET: /Account/ResetPasswordConfirmation + [HttpGet] + [AllowAnonymous] + public IActionResult ResetPasswordConfirmation() + { + return View(); + } + + // + // GET: /Account/SendCode + [HttpGet] + [AllowAnonymous] + public async Task SendCode(string returnUrl = null, bool rememberMe = false) + { + var user = await _signInManager.GetTwoFactorAuthenticationUserAsync(); + if (user == null) + { + return View("Error"); + } + var userFactors = await _userManager.GetValidTwoFactorProvidersAsync(user); + var factorOptions = userFactors.Select(purpose => new SelectListItem { Text = purpose, Value = purpose }).ToList(); + return View(new SendCodeViewModel { Providers = factorOptions, ReturnUrl = returnUrl, RememberMe = rememberMe }); + } + + // + // POST: /Account/SendCode + [HttpPost] + [AllowAnonymous] + [ValidateAntiForgeryToken] + public async Task SendCode(SendCodeViewModel model) + { + if (!ModelState.IsValid) + { + return View(); + } + + var user = await _signInManager.GetTwoFactorAuthenticationUserAsync(); + if (user == null) + { + return View("Error"); + } + + // Generate the token and send it + var code = await _userManager.GenerateTwoFactorTokenAsync(user, model.SelectedProvider); + if (string.IsNullOrWhiteSpace(code)) + { + return View("Error"); + } + + var message = "Your security code is: " + code; + if (model.SelectedProvider == "Email") + { + await _emailSender.SendEmailAsync(await _userManager.GetEmailAsync(user), "Security Code", message); + } + else if (model.SelectedProvider == "Phone") + { + await _smsSender.SendSmsAsync(await _userManager.GetPhoneNumberAsync(user), message); + } + + return RedirectToAction(nameof(VerifyCode), new { Provider = model.SelectedProvider, ReturnUrl = model.ReturnUrl, RememberMe = model.RememberMe }); + } + + // + // GET: /Account/VerifyCode + [HttpGet] + [AllowAnonymous] + public async Task VerifyCode(string provider, bool rememberMe, string returnUrl = null) + { + // Require that the user has already logged in via username/password or external login + var user = await _signInManager.GetTwoFactorAuthenticationUserAsync(); + if (user == null) + { + return View("Error"); + } + return View(new VerifyCodeViewModel { Provider = provider, ReturnUrl = returnUrl, RememberMe = rememberMe }); + } + + // + // POST: /Account/VerifyCode + [HttpPost] + [AllowAnonymous] + [ValidateAntiForgeryToken] + public async Task VerifyCode(VerifyCodeViewModel model) + { + if (!ModelState.IsValid) + { + return View(model); + } + + // The following code protects for brute force attacks against the two factor codes. + // If a user enters incorrect codes for a specified amount of time then the user account + // will be locked out for a specified amount of time. + var result = await _signInManager.TwoFactorSignInAsync(model.Provider, model.Code, model.RememberMe, model.RememberBrowser); + if (result.Succeeded) + { + return RedirectToLocal(model.ReturnUrl); + } + if (result.IsLockedOut) + { + _logger.LogWarning(7, "User account locked out."); + return View("Lockout"); + } + else + { + ModelState.AddModelError(string.Empty, "Invalid code."); + return View(model); + } + } + + #region Helpers + + private void AddErrors(IdentityResult result) + { + foreach (var error in result.Errors) + { + ModelState.AddModelError(string.Empty, error.Description); + } + } + + private Task GetCurrentUserAsync() + { + return _userManager.GetUserAsync(HttpContext.User); + } + + private IActionResult RedirectToLocal(string returnUrl) + { + if (Url.IsLocalUrl(returnUrl)) + { + return Redirect(returnUrl); + } + else + { + return RedirectToAction(nameof(HomeController.Index), "Home"); + } + } + + #endregion + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Controllers/HomeController.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Controllers/HomeController.cs new file mode 100644 index 000000000..4b21d0cce --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Controllers/HomeController.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +namespace WebApplication.Controllers +{ + public class HomeController : Controller + { + public IActionResult Index() + { + return View(); + } + + public IActionResult About() + { + ViewData["Message"] = "Your application description page."; + + return View(); + } + + public IActionResult Contact() + { + ViewData["Message"] = "Your contact page."; + + return View(); + } + + public IActionResult Error() + { + return View(); + } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Controllers/ManageController.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Controllers/ManageController.cs new file mode 100644 index 000000000..8d04fe58b --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Controllers/ManageController.cs @@ -0,0 +1,347 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; +using WebApplication.Models; +using WebApplication.Models.ManageViewModels; +using WebApplication.Services; + +namespace WebApplication.Controllers +{ + [Authorize] + public class ManageController : Controller + { + private readonly UserManager _userManager; + private readonly SignInManager _signInManager; + private readonly IEmailSender _emailSender; + private readonly ISmsSender _smsSender; + private readonly ILogger _logger; + + public ManageController( + UserManager userManager, + SignInManager signInManager, + IEmailSender emailSender, + ISmsSender smsSender, + ILoggerFactory loggerFactory) + { + _userManager = userManager; + _signInManager = signInManager; + _emailSender = emailSender; + _smsSender = smsSender; + _logger = loggerFactory.CreateLogger(); + } + + // + // GET: /Manage/Index + [HttpGet] + public async Task Index(ManageMessageId? message = null) + { + ViewData["StatusMessage"] = + message == ManageMessageId.ChangePasswordSuccess ? "Your password has been changed." + : message == ManageMessageId.SetPasswordSuccess ? "Your password has been set." + : message == ManageMessageId.SetTwoFactorSuccess ? "Your two-factor authentication provider has been set." + : message == ManageMessageId.Error ? "An error has occurred." + : message == ManageMessageId.AddPhoneSuccess ? "Your phone number was added." + : message == ManageMessageId.RemovePhoneSuccess ? "Your phone number was removed." + : ""; + + var user = await GetCurrentUserAsync(); + var model = new IndexViewModel + { + HasPassword = await _userManager.HasPasswordAsync(user), + PhoneNumber = await _userManager.GetPhoneNumberAsync(user), + TwoFactor = await _userManager.GetTwoFactorEnabledAsync(user), + Logins = await _userManager.GetLoginsAsync(user), + BrowserRemembered = await _signInManager.IsTwoFactorClientRememberedAsync(user) + }; + return View(model); + } + + // + // POST: /Manage/RemoveLogin + [HttpPost] + [ValidateAntiForgeryToken] + public async Task RemoveLogin(RemoveLoginViewModel account) + { + ManageMessageId? message = ManageMessageId.Error; + var user = await GetCurrentUserAsync(); + if (user != null) + { + var result = await _userManager.RemoveLoginAsync(user, account.LoginProvider, account.ProviderKey); + if (result.Succeeded) + { + await _signInManager.SignInAsync(user, isPersistent: false); + message = ManageMessageId.RemoveLoginSuccess; + } + } + return RedirectToAction(nameof(ManageLogins), new { Message = message }); + } + + // + // GET: /Manage/AddPhoneNumber + public IActionResult AddPhoneNumber() + { + return View(); + } + + // + // POST: /Manage/AddPhoneNumber + [HttpPost] + [ValidateAntiForgeryToken] + public async Task AddPhoneNumber(AddPhoneNumberViewModel model) + { + if (!ModelState.IsValid) + { + return View(model); + } + // Generate the token and send it + var user = await GetCurrentUserAsync(); + var code = await _userManager.GenerateChangePhoneNumberTokenAsync(user, model.PhoneNumber); + await _smsSender.SendSmsAsync(model.PhoneNumber, "Your security code is: " + code); + return RedirectToAction(nameof(VerifyPhoneNumber), new { PhoneNumber = model.PhoneNumber }); + } + + // + // POST: /Manage/EnableTwoFactorAuthentication + [HttpPost] + [ValidateAntiForgeryToken] + public async Task EnableTwoFactorAuthentication() + { + var user = await GetCurrentUserAsync(); + if (user != null) + { + await _userManager.SetTwoFactorEnabledAsync(user, true); + await _signInManager.SignInAsync(user, isPersistent: false); + _logger.LogInformation(1, "User enabled two-factor authentication."); + } + return RedirectToAction(nameof(Index), "Manage"); + } + + // + // POST: /Manage/DisableTwoFactorAuthentication + [HttpPost] + [ValidateAntiForgeryToken] + public async Task DisableTwoFactorAuthentication() + { + var user = await GetCurrentUserAsync(); + if (user != null) + { + await _userManager.SetTwoFactorEnabledAsync(user, false); + await _signInManager.SignInAsync(user, isPersistent: false); + _logger.LogInformation(2, "User disabled two-factor authentication."); + } + return RedirectToAction(nameof(Index), "Manage"); + } + + // + // GET: /Manage/VerifyPhoneNumber + [HttpGet] + public async Task VerifyPhoneNumber(string phoneNumber) + { + var code = await _userManager.GenerateChangePhoneNumberTokenAsync(await GetCurrentUserAsync(), phoneNumber); + // Send an SMS to verify the phone number + return phoneNumber == null ? View("Error") : View(new VerifyPhoneNumberViewModel { PhoneNumber = phoneNumber }); + } + + // + // POST: /Manage/VerifyPhoneNumber + [HttpPost] + [ValidateAntiForgeryToken] + public async Task VerifyPhoneNumber(VerifyPhoneNumberViewModel model) + { + if (!ModelState.IsValid) + { + return View(model); + } + var user = await GetCurrentUserAsync(); + if (user != null) + { + var result = await _userManager.ChangePhoneNumberAsync(user, model.PhoneNumber, model.Code); + if (result.Succeeded) + { + await _signInManager.SignInAsync(user, isPersistent: false); + return RedirectToAction(nameof(Index), new { Message = ManageMessageId.AddPhoneSuccess }); + } + } + // If we got this far, something failed, redisplay the form + ModelState.AddModelError(string.Empty, "Failed to verify phone number"); + return View(model); + } + + // + // POST: /Manage/RemovePhoneNumber + [HttpPost] + [ValidateAntiForgeryToken] + public async Task RemovePhoneNumber() + { + var user = await GetCurrentUserAsync(); + if (user != null) + { + var result = await _userManager.SetPhoneNumberAsync(user, null); + if (result.Succeeded) + { + await _signInManager.SignInAsync(user, isPersistent: false); + return RedirectToAction(nameof(Index), new { Message = ManageMessageId.RemovePhoneSuccess }); + } + } + return RedirectToAction(nameof(Index), new { Message = ManageMessageId.Error }); + } + + // + // GET: /Manage/ChangePassword + [HttpGet] + public IActionResult ChangePassword() + { + return View(); + } + + // + // POST: /Manage/ChangePassword + [HttpPost] + [ValidateAntiForgeryToken] + public async Task ChangePassword(ChangePasswordViewModel model) + { + if (!ModelState.IsValid) + { + return View(model); + } + var user = await GetCurrentUserAsync(); + if (user != null) + { + var result = await _userManager.ChangePasswordAsync(user, model.OldPassword, model.NewPassword); + if (result.Succeeded) + { + await _signInManager.SignInAsync(user, isPersistent: false); + _logger.LogInformation(3, "User changed their password successfully."); + return RedirectToAction(nameof(Index), new { Message = ManageMessageId.ChangePasswordSuccess }); + } + AddErrors(result); + return View(model); + } + return RedirectToAction(nameof(Index), new { Message = ManageMessageId.Error }); + } + + // + // GET: /Manage/SetPassword + [HttpGet] + public IActionResult SetPassword() + { + return View(); + } + + // + // POST: /Manage/SetPassword + [HttpPost] + [ValidateAntiForgeryToken] + public async Task SetPassword(SetPasswordViewModel model) + { + if (!ModelState.IsValid) + { + return View(model); + } + + var user = await GetCurrentUserAsync(); + if (user != null) + { + var result = await _userManager.AddPasswordAsync(user, model.NewPassword); + if (result.Succeeded) + { + await _signInManager.SignInAsync(user, isPersistent: false); + return RedirectToAction(nameof(Index), new { Message = ManageMessageId.SetPasswordSuccess }); + } + AddErrors(result); + return View(model); + } + return RedirectToAction(nameof(Index), new { Message = ManageMessageId.Error }); + } + + //GET: /Manage/ManageLogins + [HttpGet] + public async Task ManageLogins(ManageMessageId? message = null) + { + ViewData["StatusMessage"] = + message == ManageMessageId.RemoveLoginSuccess ? "The external login was removed." + : message == ManageMessageId.AddLoginSuccess ? "The external login was added." + : message == ManageMessageId.Error ? "An error has occurred." + : ""; + var user = await GetCurrentUserAsync(); + if (user == null) + { + return View("Error"); + } + var userLogins = await _userManager.GetLoginsAsync(user); + var otherLogins = _signInManager.GetExternalAuthenticationSchemes().Where(auth => userLogins.All(ul => auth.AuthenticationScheme != ul.LoginProvider)).ToList(); + ViewData["ShowRemoveButton"] = user.PasswordHash != null || userLogins.Count > 1; + return View(new ManageLoginsViewModel + { + CurrentLogins = userLogins, + OtherLogins = otherLogins + }); + } + + // + // POST: /Manage/LinkLogin + [HttpPost] + [ValidateAntiForgeryToken] + public IActionResult LinkLogin(string provider) + { + // Request a redirect to the external login provider to link a login for the current user + var redirectUrl = Url.Action("LinkLoginCallback", "Manage"); + var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl, _userManager.GetUserId(User)); + return Challenge(properties, provider); + } + + // + // GET: /Manage/LinkLoginCallback + [HttpGet] + public async Task LinkLoginCallback() + { + var user = await GetCurrentUserAsync(); + if (user == null) + { + return View("Error"); + } + var info = await _signInManager.GetExternalLoginInfoAsync(await _userManager.GetUserIdAsync(user)); + if (info == null) + { + return RedirectToAction(nameof(ManageLogins), new { Message = ManageMessageId.Error }); + } + var result = await _userManager.AddLoginAsync(user, info); + var message = result.Succeeded ? ManageMessageId.AddLoginSuccess : ManageMessageId.Error; + return RedirectToAction(nameof(ManageLogins), new { Message = message }); + } + + #region Helpers + + private void AddErrors(IdentityResult result) + { + foreach (var error in result.Errors) + { + ModelState.AddModelError(string.Empty, error.Description); + } + } + + public enum ManageMessageId + { + AddPhoneSuccess, + AddLoginSuccess, + ChangePasswordSuccess, + SetTwoFactorSuccess, + SetPasswordSuccess, + RemoveLoginSuccess, + RemovePhoneSuccess, + Error + } + + private Task GetCurrentUserAsync() + { + return _userManager.GetUserAsync(HttpContext.User); + } + + #endregion + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Data/ApplicationDbContext.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Data/ApplicationDbContext.cs new file mode 100644 index 000000000..336e6d466 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Data/ApplicationDbContext.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using WebApplication.Models; + +namespace WebApplication.Data +{ + public class ApplicationDbContext : IdentityDbContext + { + public ApplicationDbContext(DbContextOptions options) + : base(options) + { + } + + protected override void OnModelCreating(ModelBuilder builder) + { + base.OnModelCreating(builder); + // Customize the ASP.NET Identity model and override the defaults if needed. + // For example, you can rename the ASP.NET Identity table names and more. + // Add your customizations after calling base.OnModelCreating(builder); + } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs new file mode 100644 index 000000000..bb12d2bbb --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs @@ -0,0 +1,212 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using WebApplication.Data; + +namespace WebApplication.Data.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + [Migration("00000000000000_CreateIdentitySchema")] + partial class CreateIdentitySchema + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "1.0.0-rc2-20901"); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole", b => + { + b.Property("Id"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Name") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .HasName("RoleNameIndex"); + + b.ToTable("AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("RoleId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => + { + b.Property("LoginProvider"); + + b.Property("ProviderKey"); + + b.Property("ProviderDisplayName"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserToken", b => + { + b.Property("UserId"); + + b.Property("LoginProvider"); + + b.Property("Name"); + + b.Property("Value"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens"); + }); + + modelBuilder.Entity("WebApplication.Models.ApplicationUser", b => + { + b.Property("Id"); + + b.Property("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Email") + .HasAnnotation("MaxLength", 256); + + b.Property("EmailConfirmed"); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("NormalizedEmail") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedUserName") + .HasAnnotation("MaxLength", 256); + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .HasName("UserNameIndex"); + + b.ToTable("AspNetUsers"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => + { + b.HasOne("WebApplication.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => + { + b.HasOne("WebApplication.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("WebApplication.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Data/Migrations/00000000000000_CreateIdentitySchema.cs new file mode 100644 index 000000000..e6f038f8e --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Data/Migrations/00000000000000_CreateIdentitySchema.cs @@ -0,0 +1,215 @@ +using System; +using System.Collections.Generic; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace WebApplication.Data.Migrations +{ + public partial class CreateIdentitySchema : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "AspNetRoles", + columns: table => new + { + Id = table.Column(nullable: false), + ConcurrencyStamp = table.Column(nullable: true), + Name = table.Column(nullable: true), + NormalizedName = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetRoles", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserTokens", + columns: table => new + { + UserId = table.Column(nullable: false), + LoginProvider = table.Column(nullable: false), + Name = table.Column(nullable: false), + Value = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); + }); + + migrationBuilder.CreateTable( + name: "AspNetUsers", + columns: table => new + { + Id = table.Column(nullable: false), + AccessFailedCount = table.Column(nullable: false), + ConcurrencyStamp = table.Column(nullable: true), + Email = table.Column(nullable: true), + EmailConfirmed = table.Column(nullable: false), + LockoutEnabled = table.Column(nullable: false), + LockoutEnd = table.Column(nullable: true), + NormalizedEmail = table.Column(nullable: true), + NormalizedUserName = table.Column(nullable: true), + PasswordHash = table.Column(nullable: true), + PhoneNumber = table.Column(nullable: true), + PhoneNumberConfirmed = table.Column(nullable: false), + SecurityStamp = table.Column(nullable: true), + TwoFactorEnabled = table.Column(nullable: false), + UserName = table.Column(nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUsers", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "AspNetRoleClaims", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Autoincrement", true), + ClaimType = table.Column(nullable: true), + ClaimValue = table.Column(nullable: true), + RoleId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id); + table.ForeignKey( + name: "FK_AspNetRoleClaims_AspNetRoles_RoleId", + column: x => x.RoleId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserClaims", + columns: table => new + { + Id = table.Column(nullable: false) + .Annotation("Autoincrement", true), + ClaimType = table.Column(nullable: true), + ClaimValue = table.Column(nullable: true), + UserId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserClaims", x => x.Id); + table.ForeignKey( + name: "FK_AspNetUserClaims_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserLogins", + columns: table => new + { + LoginProvider = table.Column(nullable: false), + ProviderKey = table.Column(nullable: false), + ProviderDisplayName = table.Column(nullable: true), + UserId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey }); + table.ForeignKey( + name: "FK_AspNetUserLogins_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "AspNetUserRoles", + columns: table => new + { + UserId = table.Column(nullable: false), + RoleId = table.Column(nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId }); + table.ForeignKey( + name: "FK_AspNetUserRoles_AspNetRoles_RoleId", + column: x => x.RoleId, + principalTable: "AspNetRoles", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_AspNetUserRoles_AspNetUsers_UserId", + column: x => x.UserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "RoleNameIndex", + table: "AspNetRoles", + column: "NormalizedName"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetRoleClaims_RoleId", + table: "AspNetRoleClaims", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserClaims_UserId", + table: "AspNetUserClaims", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserLogins_UserId", + table: "AspNetUserLogins", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserRoles_RoleId", + table: "AspNetUserRoles", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "IX_AspNetUserRoles_UserId", + table: "AspNetUserRoles", + column: "UserId"); + + migrationBuilder.CreateIndex( + name: "EmailIndex", + table: "AspNetUsers", + column: "NormalizedEmail"); + + migrationBuilder.CreateIndex( + name: "UserNameIndex", + table: "AspNetUsers", + column: "NormalizedUserName"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "AspNetRoleClaims"); + + migrationBuilder.DropTable( + name: "AspNetUserClaims"); + + migrationBuilder.DropTable( + name: "AspNetUserLogins"); + + migrationBuilder.DropTable( + name: "AspNetUserRoles"); + + migrationBuilder.DropTable( + name: "AspNetUserTokens"); + + migrationBuilder.DropTable( + name: "AspNetRoles"); + + migrationBuilder.DropTable( + name: "AspNetUsers"); + } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Data/Migrations/ApplicationDbContextModelSnapshot.cs new file mode 100644 index 000000000..cb459319d --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -0,0 +1,211 @@ +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using WebApplication.Data; + +namespace WebApplication.Data.Migrations +{ + [DbContext(typeof(ApplicationDbContext))] + partial class ApplicationDbContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { + modelBuilder + .HasAnnotation("ProductVersion", "1.0.0-rc2-20901"); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole", b => + { + b.Property("Id"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Name") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .HasName("RoleNameIndex"); + + b.ToTable("AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("RoleId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd(); + + b.Property("ClaimType"); + + b.Property("ClaimValue"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => + { + b.Property("LoginProvider"); + + b.Property("ProviderKey"); + + b.Property("ProviderDisplayName"); + + b.Property("UserId") + .IsRequired(); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => + { + b.Property("UserId"); + + b.Property("RoleId"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserToken", b => + { + b.Property("UserId"); + + b.Property("LoginProvider"); + + b.Property("Name"); + + b.Property("Value"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens"); + }); + + modelBuilder.Entity("WebApplication.Models.ApplicationUser", b => + { + b.Property("Id"); + + b.Property("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Email") + .HasAnnotation("MaxLength", 256); + + b.Property("EmailConfirmed"); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("NormalizedEmail") + .HasAnnotation("MaxLength", 256); + + b.Property("NormalizedUserName") + .HasAnnotation("MaxLength", 256); + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") + .HasAnnotation("MaxLength", 256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .HasName("UserNameIndex"); + + b.ToTable("AspNetUsers"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => + { + b.HasOne("WebApplication.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => + { + b.HasOne("WebApplication.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("WebApplication.Models.ApplicationUser") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade); + }); + } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs new file mode 100644 index 000000000..a60894ce8 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/ExternalLoginConfirmationViewModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Models.AccountViewModels +{ + public class ExternalLoginConfirmationViewModel + { + [Required] + [EmailAddress] + public string Email { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/ForgotPasswordViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/ForgotPasswordViewModel.cs new file mode 100644 index 000000000..70fab0c9f --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/ForgotPasswordViewModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Models.AccountViewModels +{ + public class ForgotPasswordViewModel + { + [Required] + [EmailAddress] + public string Email { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/LoginViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/LoginViewModel.cs new file mode 100644 index 000000000..7dc974b6b --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/LoginViewModel.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Models.AccountViewModels +{ + public class LoginViewModel + { + [Required] + [EmailAddress] + public string Email { get; set; } + + [Required] + [DataType(DataType.Password)] + public string Password { get; set; } + + [Display(Name = "Remember me?")] + public bool RememberMe { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/RegisterViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/RegisterViewModel.cs new file mode 100644 index 000000000..bc86f2aed --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/RegisterViewModel.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Models.AccountViewModels +{ + public class RegisterViewModel + { + [Required] + [EmailAddress] + [Display(Name = "Email")] + public string Email { get; set; } + + [Required] + [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] + [DataType(DataType.Password)] + [Display(Name = "Password")] + public string Password { get; set; } + + [DataType(DataType.Password)] + [Display(Name = "Confirm password")] + [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] + public string ConfirmPassword { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/ResetPasswordViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/ResetPasswordViewModel.cs new file mode 100644 index 000000000..43198b7e5 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/ResetPasswordViewModel.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Models.AccountViewModels +{ + public class ResetPasswordViewModel + { + [Required] + [EmailAddress] + public string Email { get; set; } + + [Required] + [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] + [DataType(DataType.Password)] + public string Password { get; set; } + + [DataType(DataType.Password)] + [Display(Name = "Confirm password")] + [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] + public string ConfirmPassword { get; set; } + + public string Code { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/SendCodeViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/SendCodeViewModel.cs new file mode 100644 index 000000000..b8ed8f1d4 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/SendCodeViewModel.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc.Rendering; + +namespace WebApplication.Models.AccountViewModels +{ + public class SendCodeViewModel + { + public string SelectedProvider { get; set; } + + public ICollection Providers { get; set; } + + public string ReturnUrl { get; set; } + + public bool RememberMe { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/VerifyCodeViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/VerifyCodeViewModel.cs new file mode 100644 index 000000000..394db8c59 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/AccountViewModels/VerifyCodeViewModel.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Models.AccountViewModels +{ + public class VerifyCodeViewModel + { + [Required] + public string Provider { get; set; } + + [Required] + public string Code { get; set; } + + public string ReturnUrl { get; set; } + + [Display(Name = "Remember this browser?")] + public bool RememberBrowser { get; set; } + + [Display(Name = "Remember me?")] + public bool RememberMe { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ApplicationUser.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ApplicationUser.cs new file mode 100644 index 000000000..4642ef2c3 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ApplicationUser.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; + +namespace WebApplication.Models +{ + // Add profile data for application users by adding properties to the ApplicationUser class + public class ApplicationUser : IdentityUser + { + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/AddPhoneNumberViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/AddPhoneNumberViewModel.cs new file mode 100644 index 000000000..d2baaf7e0 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/AddPhoneNumberViewModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Models.ManageViewModels +{ + public class AddPhoneNumberViewModel + { + [Required] + [Phone] + [Display(Name = "Phone number")] + public string PhoneNumber { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/ChangePasswordViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/ChangePasswordViewModel.cs new file mode 100644 index 000000000..421b91a03 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/ChangePasswordViewModel.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Models.ManageViewModels +{ + public class ChangePasswordViewModel + { + [Required] + [DataType(DataType.Password)] + [Display(Name = "Current password")] + public string OldPassword { get; set; } + + [Required] + [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] + [DataType(DataType.Password)] + [Display(Name = "New password")] + public string NewPassword { get; set; } + + [DataType(DataType.Password)] + [Display(Name = "Confirm new password")] + [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")] + public string ConfirmPassword { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs new file mode 100644 index 000000000..beb1fd1a4 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc.Rendering; + +namespace WebApplication.Models.ManageViewModels +{ + public class ConfigureTwoFactorViewModel + { + public string SelectedProvider { get; set; } + + public ICollection Providers { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/FactorViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/FactorViewModel.cs new file mode 100644 index 000000000..b2d4f9e2f --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/FactorViewModel.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Models.ManageViewModels +{ + public class FactorViewModel + { + public string Purpose { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/IndexViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/IndexViewModel.cs new file mode 100644 index 000000000..e0b69f2df --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/IndexViewModel.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Identity; + +namespace WebApplication.Models.ManageViewModels +{ + public class IndexViewModel + { + public bool HasPassword { get; set; } + + public IList Logins { get; set; } + + public string PhoneNumber { get; set; } + + public bool TwoFactor { get; set; } + + public bool BrowserRemembered { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/ManageLoginsViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/ManageLoginsViewModel.cs new file mode 100644 index 000000000..fc03a0c27 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/ManageLoginsViewModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http.Authentication; +using Microsoft.AspNetCore.Identity; + +namespace WebApplication.Models.ManageViewModels +{ + public class ManageLoginsViewModel + { + public IList CurrentLogins { get; set; } + + public IList OtherLogins { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/RemoveLoginViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/RemoveLoginViewModel.cs new file mode 100644 index 000000000..394df34a0 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/RemoveLoginViewModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Models.ManageViewModels +{ + public class RemoveLoginViewModel + { + public string LoginProvider { get; set; } + public string ProviderKey { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/SetPasswordViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/SetPasswordViewModel.cs new file mode 100644 index 000000000..76c1b4bb4 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/SetPasswordViewModel.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Models.ManageViewModels +{ + public class SetPasswordViewModel + { + [Required] + [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)] + [DataType(DataType.Password)] + [Display(Name = "New password")] + public string NewPassword { get; set; } + + [DataType(DataType.Password)] + [Display(Name = "Confirm new password")] + [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")] + public string ConfirmPassword { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs new file mode 100644 index 000000000..3c8c08c87 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Models/ManageViewModels/VerifyPhoneNumberViewModel.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Models.ManageViewModels +{ + public class VerifyPhoneNumberViewModel + { + [Required] + public string Code { get; set; } + + [Required] + [Phone] + [Display(Name = "Phone number")] + public string PhoneNumber { get; set; } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Program.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Program.cs new file mode 100644 index 000000000..74e9753fb --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Program.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; + +namespace WebApplication +{ + public class Program + { + public static void Main(string[] args) + { + var host = new WebHostBuilder() + .UseKestrel() + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseIISIntegration() + .UseStartup() + .Build(); + + host.Run(); + } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/README.md b/src/dotnet/commands/dotnet-new/CSharp_Web/README.md new file mode 100644 index 000000000..d8ba0b382 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/README.md @@ -0,0 +1,39 @@ +# Welcome to ASP.NET Core + +We've made some big updates in this release, so it’s **important** that you spend a few minutes to learn what’s new. + +You've created a new ASP.NET Core project. [Learn what's new](https://go.microsoft.com/fwlink/?LinkId=518016) + +## This application consists of: + +* Sample pages using ASP.NET Core MVC +* [Gulp](https://go.microsoft.com/fwlink/?LinkId=518007) and [Bower](https://go.microsoft.com/fwlink/?LinkId=518004) for managing client-side libraries +* Theming using [Bootstrap](https://go.microsoft.com/fwlink/?LinkID=398939) + +## How to + +* [Add a Controller and View](https://go.microsoft.com/fwlink/?LinkID=398600) +* [Add an appsetting in config and access it in app.](https://go.microsoft.com/fwlink/?LinkID=699562) +* [Manage User Secrets using Secret Manager.](https://go.microsoft.com/fwlink/?LinkId=699315) +* [Use logging to log a message.](https://go.microsoft.com/fwlink/?LinkId=699316) +* [Add packages using NuGet.](https://go.microsoft.com/fwlink/?LinkId=699317) +* [Add client packages using Bower.](https://go.microsoft.com/fwlink/?LinkId=699318) +* [Target development, staging or production environment.](https://go.microsoft.com/fwlink/?LinkId=699319) + +## Overview + +* [Conceptual overview of what is ASP.NET Core](https://go.microsoft.com/fwlink/?LinkId=518008) +* [Fundamentals of ASP.NET Core such as Startup and middleware.](https://go.microsoft.com/fwlink/?LinkId=699320) +* [Working with Data](https://go.microsoft.com/fwlink/?LinkId=398602) +* [Security](https://go.microsoft.com/fwlink/?LinkId=398603) +* [Client side development](https://go.microsoft.com/fwlink/?LinkID=699321) +* [Develop on different platforms](https://go.microsoft.com/fwlink/?LinkID=699322) +* [Read more on the documentation site](https://go.microsoft.com/fwlink/?LinkID=699323) + +## Run & Deploy + +* [Run your app](https://go.microsoft.com/fwlink/?LinkID=517851) +* [Run tools such as EF migrations and more](https://go.microsoft.com/fwlink/?LinkID=517853) +* [Publish to Microsoft Azure Web Apps](https://go.microsoft.com/fwlink/?LinkID=398609) + +We would love to hear your [feedback](https://go.microsoft.com/fwlink/?LinkId=518015) diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Services/IEmailSender.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Services/IEmailSender.cs new file mode 100644 index 000000000..08fb35bad --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Services/IEmailSender.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Services +{ + public interface IEmailSender + { + Task SendEmailAsync(string email, string subject, string message); + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Services/ISmsSender.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Services/ISmsSender.cs new file mode 100644 index 000000000..8e57a2343 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Services/ISmsSender.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Services +{ + public interface ISmsSender + { + Task SendSmsAsync(string number, string message); + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Services/MessageServices.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Services/MessageServices.cs new file mode 100644 index 000000000..de54bfc79 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Services/MessageServices.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace WebApplication.Services +{ + // This class is used by the application to send Email and SMS + // when you turn on two-factor authentication in ASP.NET Identity. + // For more details see this link https://go.microsoft.com/fwlink/?LinkID=532713 + public class AuthMessageSender : IEmailSender, ISmsSender + { + public Task SendEmailAsync(string email, string subject, string message) + { + // Plug in your email service here to send an email. + return Task.FromResult(0); + } + + public Task SendSmsAsync(string number, string message) + { + // Plug in your SMS service here to send a text message. + return Task.FromResult(0); + } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Startup.cs b/src/dotnet/commands/dotnet-new/CSharp_Web/Startup.cs new file mode 100644 index 000000000..2fa7ae51b --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Startup.cs @@ -0,0 +1,88 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using WebApplication.Data; +using WebApplication.Models; +using WebApplication.Services; + +namespace WebApplication +{ + public class Startup + { + public Startup(IHostingEnvironment env) + { + var builder = new ConfigurationBuilder() + .SetBasePath(env.ContentRootPath) + .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) + .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true); + + if (env.IsDevelopment()) + { + // For more details on using the user secret store see https://go.microsoft.com/fwlink/?LinkID=532709 + builder.AddUserSecrets(); + } + + builder.AddEnvironmentVariables(); + Configuration = builder.Build(); + } + + public IConfigurationRoot Configuration { get; } + + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices(IServiceCollection services) + { + // Add framework services. + services.AddDbContext(options => + options.UseSqlite(Configuration.GetConnectionString("DefaultConnection"))); + + services.AddIdentity() + .AddEntityFrameworkStores() + .AddDefaultTokenProviders(); + + services.AddMvc(); + + // Add application services. + services.AddTransient(); + services.AddTransient(); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + { + loggerFactory.AddConsole(Configuration.GetSection("Logging")); + loggerFactory.AddDebug(); + + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + app.UseDatabaseErrorPage(); + app.UseBrowserLink(); + } + else + { + app.UseExceptionHandler("/Home/Error"); + } + + app.UseStaticFiles(); + + app.UseIdentity(); + + // Add external authentication middleware below. To configure them please see https://go.microsoft.com/fwlink/?LinkID=532715 + + app.UseMvc(routes => + { + routes.MapRoute( + name: "default", + template: "{controller=Home}/{action=Index}/{id?}"); + }); + } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ConfirmEmail.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ConfirmEmail.cshtml new file mode 100644 index 000000000..8e8088d44 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ConfirmEmail.cshtml @@ -0,0 +1,10 @@ +@{ + ViewData["Title"] = "Confirm Email"; +} + +

@ViewData["Title"].

+
+

+ Thank you for confirming your email. Please Click here to Log in. +

+
diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ExternalLoginConfirmation.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ExternalLoginConfirmation.cshtml new file mode 100644 index 000000000..eb3612b55 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ExternalLoginConfirmation.cshtml @@ -0,0 +1,35 @@ +@model ExternalLoginConfirmationViewModel +@{ + ViewData["Title"] = "Register"; +} + +

@ViewData["Title"].

+

Associate your @ViewData["LoginProvider"] account.

+ +
+

Association Form

+
+
+ +

+ You've successfully authenticated with @ViewData["LoginProvider"]. + Please enter an email address for this site below and click the Register button to finish + logging in. +

+
+ +
+ + +
+
+
+
+ +
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ExternalLoginFailure.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ExternalLoginFailure.cshtml new file mode 100644 index 000000000..2509746be --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ExternalLoginFailure.cshtml @@ -0,0 +1,8 @@ +@{ + ViewData["Title"] = "Login Failure"; +} + +
+

@ViewData["Title"].

+

Unsuccessful login with service.

+
diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ForgotPassword.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ForgotPassword.cshtml new file mode 100644 index 000000000..9d748023f --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ForgotPassword.cshtml @@ -0,0 +1,31 @@ +@model ForgotPasswordViewModel +@{ + ViewData["Title"] = "Forgot your password?"; +} + +

@ViewData["Title"]

+

+ For more information on how to enable reset password please see this article. +

+ +@*
+

Enter your email.

+
+
+
+ +
+ + +
+
+
+
+ +
+
+
*@ + +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ForgotPasswordConfirmation.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ForgotPasswordConfirmation.cshtml new file mode 100644 index 000000000..4877fc83a --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ForgotPasswordConfirmation.cshtml @@ -0,0 +1,8 @@ +@{ + ViewData["Title"] = "Forgot Password Confirmation"; +} + +

@ViewData["Title"].

+

+ Please check your email to reset your password. +

diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/Lockout.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/Lockout.cshtml new file mode 100644 index 000000000..34ac56ff3 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/Lockout.cshtml @@ -0,0 +1,8 @@ +@{ + ViewData["Title"] = "Locked out"; +} + +
+

Locked out.

+

This account has been locked out, please try again later.

+
diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/Login.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/Login.cshtml new file mode 100644 index 000000000..95430a12e --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/Login.cshtml @@ -0,0 +1,92 @@ +@using System.Collections.Generic +@using Microsoft.AspNetCore.Http +@using Microsoft.AspNetCore.Http.Authentication +@model LoginViewModel +@inject SignInManager SignInManager + +@{ + ViewData["Title"] = "Log in"; +} + +

@ViewData["Title"].

+
+
+
+
+

Use a local account to log in.

+
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+
+
+ +
+
+
+
+
+ +
+
+

+ Register as a new user? +

+

+ Forgot your password? +

+
+
+
+
+
+

Use another service to log in.

+
+ @{ + var loginProviders = SignInManager.GetExternalAuthenticationSchemes().ToList(); + if (loginProviders.Count == 0) + { +
+

+ There are no external authentication services configured. See this article + for details on setting up this ASP.NET application to support logging in via external services. +

+
+ } + else + { +
+
+

+ @foreach (var provider in loginProviders) + { + + } +

+
+
+ } + } +
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/Register.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/Register.cshtml new file mode 100644 index 000000000..2090f900e --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/Register.cshtml @@ -0,0 +1,42 @@ +@model RegisterViewModel +@{ + ViewData["Title"] = "Register"; +} + +

@ViewData["Title"].

+ +
+

Create a new account.

+
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+
+ +
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ResetPassword.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ResetPassword.cshtml new file mode 100644 index 000000000..dd716d735 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ResetPassword.cshtml @@ -0,0 +1,43 @@ +@model ResetPasswordViewModel +@{ + ViewData["Title"] = "Reset password"; +} + +

@ViewData["Title"].

+ +
+

Reset your password.

+
+
+ +
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+
+ +
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ResetPasswordConfirmation.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ResetPasswordConfirmation.cshtml new file mode 100644 index 000000000..6321d858e --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/ResetPasswordConfirmation.cshtml @@ -0,0 +1,8 @@ +@{ + ViewData["Title"] = "Reset password confirmation"; +} + +

@ViewData["Title"].

+

+ Your password has been reset. Please Click here to log in. +

diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/SendCode.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/SendCode.cshtml new file mode 100644 index 000000000..e85ca3c2b --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/SendCode.cshtml @@ -0,0 +1,21 @@ +@model SendCodeViewModel +@{ + ViewData["Title"] = "Send Verification Code"; +} + +

@ViewData["Title"].

+ +
+ +
+
+ Select Two-Factor Authentication Provider: + + +
+
+
+ +@section Scripts { + @{await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/VerifyCode.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/VerifyCode.cshtml new file mode 100644 index 000000000..60afb361d --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Account/VerifyCode.cshtml @@ -0,0 +1,38 @@ +@model VerifyCodeViewModel +@{ + ViewData["Title"] = "Verify"; +} + +

@ViewData["Title"].

+ +
+
+ + +

@ViewData["Status"]

+
+
+ +
+ + +
+
+
+
+
+ + +
+
+
+
+
+ +
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Home/About.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Home/About.cshtml new file mode 100644 index 000000000..b653a26f1 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Home/About.cshtml @@ -0,0 +1,7 @@ +@{ + ViewData["Title"] = "About"; +} +

@ViewData["Title"].

+

@ViewData["Message"]

+ +

Use this area to provide additional information.

diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Home/Contact.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Home/Contact.cshtml new file mode 100644 index 000000000..f953aa63d --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Home/Contact.cshtml @@ -0,0 +1,17 @@ +@{ + ViewData["Title"] = "Contact"; +} +

@ViewData["Title"].

+

@ViewData["Message"]

+ +
+ One Microsoft Way
+ Redmond, WA 98052-6399
+ P: + 425.555.0100 +
+ +
+ Support: Support@example.com
+ Marketing: Marketing@example.com +
diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Home/Index.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Home/Index.cshtml new file mode 100644 index 000000000..957b8c1da --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Home/Index.cshtml @@ -0,0 +1,109 @@ +@{ + ViewData["Title"] = "Home Page"; +} + + + +
+
+

Application uses

+
    +
  • Sample pages using ASP.NET Core MVC
    • +
  • Gulp and Bower for managing client-side libraries
    • +
  • Theming using Bootstrap
    • +
+
+
+

How to

+ +
+
+

Overview

+ +
+
+

Run & Deploy

+ +
+
diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/AddPhoneNumber.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/AddPhoneNumber.cshtml new file mode 100644 index 000000000..2feb93b22 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/AddPhoneNumber.cshtml @@ -0,0 +1,27 @@ +@model AddPhoneNumberViewModel +@{ + ViewData["Title"] = "Add Phone Number"; +} + +

@ViewData["Title"].

+
+

Add a phone number.

+
+
+
+ +
+ + +
+
+
+
+ +
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/ChangePassword.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/ChangePassword.cshtml new file mode 100644 index 000000000..41c7960c8 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/ChangePassword.cshtml @@ -0,0 +1,42 @@ +@model ChangePasswordViewModel +@{ + ViewData["Title"] = "Change Password"; +} + +

@ViewData["Title"].

+ +
+

Change Password Form

+
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+
+ +
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/Index.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/Index.cshtml new file mode 100644 index 000000000..8419b2429 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/Index.cshtml @@ -0,0 +1,71 @@ +@model IndexViewModel +@{ + ViewData["Title"] = "Manage your account"; +} + +

@ViewData["Title"].

+

@ViewData["StatusMessage"]

+ +
+

Change your account settings

+
+
+
Password:
+
+ @if (Model.HasPassword) + { + Change + } + else + { + Create + } +
+
External Logins:
+
+ + @Model.Logins.Count Manage +
+
Phone Number:
+
+

+ Phone Numbers can used as a second factor of verification in two-factor authentication. + See this article + for details on setting up this ASP.NET application to support two-factor authentication using SMS. +

+ @*@(Model.PhoneNumber ?? "None") + @if (Model.PhoneNumber != null) + { +
+ Change +
+ [] +
+ } + else + { + Add + }*@ +
+ +
Two-Factor Authentication:
+
+

+ There are no two-factor authentication providers configured. See this article + for setting up this application to support two-factor authentication. +

+ @*@if (Model.TwoFactor) + { +
+ Enabled +
+ } + else + { +
+ Disabled +
+ }*@ +
+
+
diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/ManageLogins.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/ManageLogins.cshtml new file mode 100644 index 000000000..35e12da68 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/ManageLogins.cshtml @@ -0,0 +1,54 @@ +@model ManageLoginsViewModel +@using Microsoft.AspNetCore.Http.Authentication +@{ + ViewData["Title"] = "Manage your external logins"; +} + +

@ViewData["Title"].

+ +

@ViewData["StatusMessage"]

+@if (Model.CurrentLogins.Count > 0) +{ +

Registered Logins

+ + + @for (var index = 0; index < Model.CurrentLogins.Count; index++) + { + + + + + } + +
@Model.CurrentLogins[index].LoginProvider + @if ((bool)ViewData["ShowRemoveButton"]) + { +
+
+ + + +
+
+ } + else + { + @:   + } +
+} +@if (Model.OtherLogins.Count > 0) +{ +

Add another service to log in.

+
+
+
+

+ @foreach (var provider in Model.OtherLogins) + { + + } +

+
+
+} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/SetPassword.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/SetPassword.cshtml new file mode 100644 index 000000000..cfa779160 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/SetPassword.cshtml @@ -0,0 +1,38 @@ +@model SetPasswordViewModel +@{ + ViewData["Title"] = "Set Password"; +} + +

+ You do not have a local username/password for this site. Add a local + account so you can log in without an external login. +

+ +
+

Set your password

+
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+
+ +
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/VerifyPhoneNumber.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/VerifyPhoneNumber.cshtml new file mode 100644 index 000000000..af7cd0b1f --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Manage/VerifyPhoneNumber.cshtml @@ -0,0 +1,30 @@ +@model VerifyPhoneNumberViewModel +@{ + ViewData["Title"] = "Verify Phone Number"; +} + +

@ViewData["Title"].

+ +
+ +

Add a phone number.

+
@ViewData["Status"]
+
+
+
+ +
+ + +
+
+
+
+ +
+
+
+ +@section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/Error.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/Error.cshtml new file mode 100644 index 000000000..229c2dead --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/Error.cshtml @@ -0,0 +1,14 @@ +@{ + ViewData["Title"] = "Error"; +} + +

Error.

+

An error occurred while processing your request.

+ +

Development Mode

+

+ Swapping to Development environment will display more detailed information about the error that occurred. +

+

+ Development environment should not be enabled in deployed applications, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the ASPNETCORE_ENVIRONMENT environment variable to Development, and restarting the application. +

diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/_Layout.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/_Layout.cshtml new file mode 100644 index 000000000..56827ca52 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/_Layout.cshtml @@ -0,0 +1,68 @@ + + + + + + @ViewData["Title"] - WebApplication + + + + + + + + + + + +
+
+
+ + WebApplication +
+
+ + @await Html.PartialAsync("_LoginPartial") +
+
+
+
+ @RenderBody() +
+
+

© 2016 - WebApplication

+
+
+ + + + + + + + + + + + + @RenderSection("scripts", required: false) + + diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/_LoginPartial.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/_LoginPartial.cshtml new file mode 100644 index 000000000..f50d5e89e --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/_LoginPartial.cshtml @@ -0,0 +1,26 @@ +@using Microsoft.AspNetCore.Identity +@using WebApplication.Models + +@inject SignInManager SignInManager +@inject UserManager UserManager + +@if (SignInManager.IsSignedIn(User)) +{ + +} +else +{ + +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/_ValidationScriptsPartial.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/_ValidationScriptsPartial.cshtml new file mode 100644 index 000000000..289b22064 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/Shared/_ValidationScriptsPartial.cshtml @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/_ViewImports.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/_ViewImports.cshtml new file mode 100644 index 000000000..dcca16cb0 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/_ViewImports.cshtml @@ -0,0 +1,6 @@ +@using WebApplication +@using WebApplication.Models +@using WebApplication.Models.AccountViewModels +@using WebApplication.Models.ManageViewModels +@using Microsoft.AspNetCore.Identity +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/Views/_ViewStart.cshtml b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/_ViewStart.cshtml new file mode 100644 index 000000000..820a2f6e0 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/Views/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = "_Layout"; +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/appsettings.json b/src/dotnet/commands/dotnet-new/CSharp_Web/appsettings.json new file mode 100644 index 000000000..53b17ae04 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/appsettings.json @@ -0,0 +1,13 @@ +{ + "ConnectionStrings": { + "DefaultConnection": "Data Source=WebApplication.db" + }, + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/bower.json b/src/dotnet/commands/dotnet-new/CSharp_Web/bower.json new file mode 100644 index 000000000..3891fce13 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/bower.json @@ -0,0 +1,10 @@ +{ + "name": "webapplication", + "private": true, + "dependencies": { + "bootstrap": "3.3.6", + "jquery": "2.2.3", + "jquery-validation": "1.15.0", + "jquery-validation-unobtrusive": "3.2.6" + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/gulpfile.js b/src/dotnet/commands/dotnet-new/CSharp_Web/gulpfile.js new file mode 100644 index 000000000..faf295540 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/gulpfile.js @@ -0,0 +1,45 @@ +/// +"use strict"; + +var gulp = require("gulp"), + rimraf = require("rimraf"), + concat = require("gulp-concat"), + cssmin = require("gulp-cssmin"), + uglify = require("gulp-uglify"); + +var webroot = "./wwwroot/"; + +var paths = { + js: webroot + "js/**/*.js", + minJs: webroot + "js/**/*.min.js", + css: webroot + "css/**/*.css", + minCss: webroot + "css/**/*.min.css", + concatJsDest: webroot + "js/site.min.js", + concatCssDest: webroot + "css/site.min.css" +}; + +gulp.task("clean:js", function (cb) { + rimraf(paths.concatJsDest, cb); +}); + +gulp.task("clean:css", function (cb) { + rimraf(paths.concatCssDest, cb); +}); + +gulp.task("clean", ["clean:js", "clean:css"]); + +gulp.task("min:js", function () { + return gulp.src([paths.js, "!" + paths.minJs], { base: "." }) + .pipe(concat(paths.concatJsDest)) + .pipe(uglify()) + .pipe(gulp.dest(".")); +}); + +gulp.task("min:css", function () { + return gulp.src([paths.css, "!" + paths.minCss]) + .pipe(concat(paths.concatCssDest)) + .pipe(cssmin()) + .pipe(gulp.dest(".")); +}); + +gulp.task("min", ["min:js", "min:css"]); diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/package.json b/src/dotnet/commands/dotnet-new/CSharp_Web/package.json new file mode 100644 index 000000000..4bb6c884c --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/package.json @@ -0,0 +1,12 @@ +{ + "name": "webapplication", + "version": "0.0.0", + "private": true, + "devDependencies": { + "gulp": "3.9.1", + "gulp-concat": "2.6.0", + "gulp-cssmin": "0.1.7", + "gulp-uglify": "1.5.3", + "rimraf": "2.5.2" + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template new file mode 100644 index 000000000..e355cb2d8 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template @@ -0,0 +1,110 @@ +{ + "userSecretsId": "aspnet-WebApplication-0799fe3e-6eaf-4c5f-b40e-7c6bfd5dfa9a", + + "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0", + "type": "platform" + }, + "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0", + "Microsoft.AspNetCore.Diagnostics": "1.0.0", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0", + "Microsoft.AspNetCore.Mvc": "1.0.0", + "Microsoft.AspNetCore.Razor.Tools": { + "version": "1.0.0-preview2-final", + "type": "build" + }, + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", + "Microsoft.AspNetCore.StaticFiles": "1.0.0", + "Microsoft.EntityFrameworkCore.Sqlite": "1.0.0", + "Microsoft.EntityFrameworkCore.Tools": { + "version": "1.0.0-preview2-final", + "type": "build" + }, + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", + "Microsoft.Extensions.Configuration.Json": "1.0.0", + "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0", + "Microsoft.Extensions.Logging": "1.0.0", + "Microsoft.Extensions.Logging.Console": "1.0.0", + "Microsoft.Extensions.Logging.Debug": "1.0.0", + "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0", + "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { + "version": "1.0.0-preview2-final", + "type": "build" + }, + "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": { + "version": "1.0.0-preview2-final", + "type": "build" + } + }, + + "tools": { + "Microsoft.AspNetCore.Razor.Tools": { + "version": "1.0.0-preview2-final", + "imports": "portable-net45+win8+dnxcore50" + }, + "Microsoft.AspNetCore.Server.IISIntegration.Tools": { + "version": "1.0.0-preview2-final", + "imports": "portable-net45+win8+dnxcore50" + }, + "Microsoft.EntityFrameworkCore.Tools": { + "version": "1.0.0-preview2-final", + "imports": [ + "portable-net45+win8+dnxcore50", + "portable-net45+win8" + ] + }, + "Microsoft.Extensions.SecretManager.Tools": { + "version": "1.0.0-preview2-final", + "imports": "portable-net45+win8+dnxcore50" + }, + "Microsoft.VisualStudio.Web.CodeGeneration.Tools": { + "version": "1.0.0-preview2-final", + "imports": [ + "portable-net45+win8+dnxcore50", + "portable-net45+win8" + ] + } + }, + + "frameworks": { + "netcoreapp1.0": { + "imports": [ + "dotnet5.6", + "dnxcore50", + "portable-net45+win8" + ] + } + }, + + "buildOptions": { + "emitEntryPoint": true, + "preserveCompilationContext": true + }, + + "runtimeOptions": { + "configProperties": { + "System.GC.Server": true + } + }, + + "publishOptions": { + "include": [ + "wwwroot", + "Views", + "appsettings.json", + "web.config" + ] + }, + + "scripts": { + "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ], + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] + }, + + "tooling": { + "defaultNamespace": "WebApplication" + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/web.config b/src/dotnet/commands/dotnet-new/CSharp_Web/web.config new file mode 100644 index 000000000..a8d667275 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/web.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/css/site.css b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/css/site.css new file mode 100644 index 000000000..6baa84da1 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/css/site.css @@ -0,0 +1,44 @@ +body { + padding-top: 50px; + padding-bottom: 20px; +} + +/* Wrapping element */ +/* Set some basic padding to keep content from hitting the edges */ +.body-content { + padding-left: 15px; + padding-right: 15px; +} + +/* Set widths on the form inputs since otherwise they're 100% wide */ +input, +select, +textarea { + max-width: 280px; +} + +/* Carousel */ +.carousel-caption p { + font-size: 20px; + line-height: 1.4; +} + +/* buttons and links extension to use brackets: [ click me ] */ +.btn-bracketed::before { + display:inline-block; + content: "["; + padding-right: 0.5em; +} +.btn-bracketed::after { + display:inline-block; + content: "]"; + padding-left: 0.5em; +} + +/* Hide/rearrange for smaller screens */ +@media screen and (max-width: 767px) { + /* Hide captions */ + .carousel-caption { + display: none + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/css/site.min.css b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/css/site.min.css new file mode 100644 index 000000000..c8f600ac5 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/css/site.min.css @@ -0,0 +1 @@ +body{padding-top:50px;padding-bottom:20px}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.carousel-caption p{font-size:20px;line-height:1.4}.btn-bracketed::before{display:inline-block;content:"[";padding-right:.5em}.btn-bracketed::after{display:inline-block;content:"]";padding-left:.5em}@media screen and (max-width:767px){.carousel-caption{display:none}} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/favicon.ico b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a3a799985c43bc7309d701b2cad129023377dc71 GIT binary patch literal 32038 zcmeHwX>eTEbtY7aYbrGrkNjgie?1jXjZ#zP%3n{}GObKv$BxI7Sl;Bwl5E+Qtj&t8 z*p|m4DO#HoJC-FyvNnp8NP<{Na0LMnTtO21(rBP}?EAiNjWgeO?z`{3ZoURUQlV2d zY1Pqv{m|X_oO91|?^z!6@@~od!@OH>&BN;>c@O+yUfy5w>LccTKJJ&`-k<%M^Zvi( z<$dKp=jCnNX5Qa+M_%6g|IEv~4R84q9|7E=|Ho(Wz3f-0wPjaRL;W*N^>q%^KGRr7 zxbjSORb_c&eO;oV_DZ7ua!sPH=0c+W;`vzJ#j~-x3uj};50#vqo*0w4!LUqs*UCh9 zvy2S%$#8$K4EOa&e@~aBS65_hc~Mpu=454VT2^KzWqEpBA=ME|O;1cn?8p<+{MKJf zbK#@1wzL44m$k(?85=Obido7=C|xWKe%66$z)NrzRwR>?hK?_bbwT z@Da?lBrBL}Zemo1@!9pYRau&!ld17h{f+UV0sY(R{ET$PBB|-=Nr@l-nY6w8HEAw* zRMIQU`24Jl_IFEPcS=_HdrOP5yf81z_?@M>83Vv65$QFr9nPg(wr`Ke8 zaY4ogdnMA*F7a4Q1_uXadTLUpCk;$ZPRRJ^sMOch;rlbvUGc1R9=u;dr9YANbQ<4Z z#P|Cp9BP$FXNPolgyr1XGt$^lFPF}rmBF5rj1Kh5%dforrP8W}_qJL$2qMBS-#%-|s#BPZBSETsn_EBYcr(W5dq( z@f%}C|iN7)YN`^)h7R?Cg}Do*w-!zwZb9=BMp%Wsh@nb22hA zA{`wa8Q;yz6S)zfo%sl08^GF`9csI9BlGnEy#0^Y3b);M+n<(}6jziM7nhe57a1rj zC@(2ISYBL^UtWChKzVWgf%4LW2Tqg_^7jMw`C$KvU+mcakFjV(BGAW9g%CzSyM;Df z143=mq0oxaK-H;o>F3~zJ<(3-j&?|QBn)WJfP#JR zRuA;`N?L83wQt78QIA$(Z)lGQY9r^SFal;LB^qi`8%8@y+mwcGsf~nv)bBy2S7z~9 z=;X@Gglk)^jpbNz?1;`!J3QUfAOp4U$Uxm5>92iT`mek#$>s`)M>;e4{#%HAAcb^8_Ax%ersk|}# z0bd;ZPu|2}18KtvmIo8`1@H~@2ejwo(5rFS`Z4&O{$$+ch2hC0=06Jh`@p+p8LZzY z&2M~8T6X^*X?yQ$3N5EzRv$(FtSxhW>>ABUyp!{484f8(%C1_y)3D%Qgfl_!sz`LTXOjR&L!zPA0qH_iNS!tY{!^2WfD%uT}P zI<~&?@&))5&hPPHVRl9);TPO>@UI2d!^ksb!$9T96V(F){puTsn(}qt_WXNw4VvHj zf;6A_XCvE`Z@}E-IOaG0rs>K>^=Sr&OgT_p;F@v0VCN0Y$r|Lw1?Wjt`AKK~RT*kJ z2>QPuVgLNcF+XKno;WBv$yj@d_WFJbl*#*V_Cwzo@%3n5%z4g21G*PVZ)wM5$A{klYozmGlB zT@u2+s}=f}25%IA!yNcXUr!!1)z(Nqbhojg0lv@7@0UlvUMT)*r;M$d0-t)Z?B1@qQk()o!4fqvfr_I0r7 zy1(NdkHEj#Yu{K>T#We#b#FD=c1XhS{hdTh9+8gy-vkcdkk*QS@y(xxEMb1w6z<^~ zYcETGfB#ibR#ql0EiD;PR$L&Vrh2uRv5t_$;NxC;>7_S5_OXxsi8udY3BUUdi55Sk zcyKM+PQ9YMA%D1kH1q48OFG(Gbl=FmV;yk8o>k%0$rJ8%-IYsHclnYuTskkaiCGkUlkMY~mx&K}XRlKIW;odWIeuKjtbc^8bBOTqK zjj(ot`_j?A6y_h%vxE9o*ntx#PGrnK7AljD_r58ylE*oy@{IY%+mA^!|2vW_`>`aC{#3`#3;D_$^S^cM zRcF+uTO2sICledvFgNMU@A%M)%8JbSLq{dD|2|2Sg8vvh_uV6*Q?F&rKaV{v_qz&y z`f;stIb?Cb2!Cg7CG91Bhu@D@RaIrq-+o+T2fwFu#|j>lD6ZS9-t^5cx>p|?flqUA z;Cgs#V)O#`Aw4$Kr)L5?|7f4izl!;n0jux}tEW$&&YBXz9o{+~HhoiYDJ`w5BVTl&ARya=M7zdy$FEe}iGBur8XE>rhLj&_yDk5D4n2GJZ07u7%zyAfNtOLn;)M?h*Py-Xtql5aJOtL4U8e|!t? z((sc6&OJXrPdVef^wZV&x=Z&~uA7^ix8rly^rEj?#d&~pQ{HN8Yq|fZ#*bXn-26P^ z5!)xRzYO9{u6vx5@q_{FE4#7BipS#{&J7*>y}lTyV94}dfE%Yk>@@pDe&F7J09(-0|wuI|$of-MRfK51#t@t2+U|*s=W; z!Y&t{dS%!4VEEi$efA!#<<7&04?kB}Soprd8*jYv;-Qj~h~4v>{XX~kjF+@Z7<t?^|i z#>_ag2i-CRAM8Ret^rZt*^K?`G|o>1o(mLkewxyA)38k93`<~4VFI?5VB!kBh%NNU zxb8K(^-MU1ImWQxG~nFB-Un;6n{lQz_FfsW9^H$Xcn{;+W^ZcG$0qLM#eNV=vGE@# z1~k&!h4@T|IiI<47@pS|i?Qcl=XZJL#$JKve;booMqDUYY{(xcdj6STDE=n?;fsS1 ze`h~Q{CT$K{+{t+#*I1=&&-UU8M&}AwAxD-rMa=e!{0gQXP@6azBq9(ji11uJF%@5 zCvV`#*?;ZguQ7o|nH%bm*s&jLej#@B35gy32ZAE0`Pz@#j6R&kN5w{O4~1rhDoU zEBdU)%Nl?8zi|DR((u|gg~r$aLYmGMyK%FO*qLvwxK5+cn*`;O`16c!&&XT{$j~5k zXb^fbh1GT-CI*Nj{-?r7HNg=e3E{6rxuluPXY z5Nm8ktc$o4-^SO0|Es_sp!A$8GVwOX+%)cH<;=u#R#nz;7QsHl;J@a{5NUAmAHq4D zIU5@jT!h?kUp|g~iN*!>jM6K!W5ar0v~fWrSHK@})@6Lh#h)C6F6@)&-+C3(zO! z8+kV|B7LctM3DpI*~EYo>vCj>_?x&H;>y0*vKwE0?vi$CLt zfSJB##P|M2dEUDBPKW=9cY-F;L;h3Fs4E2ERdN#NSL7ctAC z?-}_a{*L@GA7JHJudxtDVA{K5Yh*k(%#x4W7w+^ zcb-+ofbT5ieG+@QG2lx&7!MyE2JWDP@$k`M;0`*d+oQmJ2A^de!3c53HFcfW_Wtv< zKghQ;*FifmI}kE4dc@1y-u;@qs|V75Z^|Q0l0?teobTE8tGl@EB?k#q_wUjypJ*R zyEI=DJ^Z+d*&}B_xoWvs27LtH7972qqMxVFcX9}c&JbeNCXUZM0`nQIkf&C}&skSt z^9fw@b^Hb)!^hE2IJq~~GktG#ZWwWG<`@V&ckVR&r=JAO4YniJewVcG`HF;59}=bf zLyz0uxf6MhuSyH#-^!ZbHxYl^mmBVrx) zyrb8sQ*qBd_WXm9c~Of$&ZP$b^)<~0%nt#7y$1Jg$e}WCK>TeUB{P>|b1FAB?%K7>;XiOfd}JQ`|IP#Vf%kVy zXa4;XFZ+>n;F>uX&3|4zqWK2u3c<>q;tzjsb1;d{u;L$-hq3qe@82(ob<3qom#%`+ z;vzYAs7TIMl_O75BXu|r`Qhc4UT*vN$3Oo0kAC!{f2#HexDy|qUpgTF;k{o6|L>7l z=?`=*LXaow1o;oNNLXsGTrvC)$R&{m=94Tf+2iTT3Y_Or z-!;^0a{kyWtO4vksG_3cyc7HQ0~detf0+2+qxq(e1NS251N}w5iTSrM)`0p8rem!j zZ56hGD=pHI*B+dd)2B`%|9f0goozCSeXPw3 z+58k~sI02Yz#lOneJzYcG)EB0|F+ggC6D|B`6}d0khAK-gz7U3EGT|M_9$ZINqZjwf>P zJCZ=ogSoE`=yV5YXrcTQZx@Un(64*AlLiyxWnCJ9I<5Nc*eK6eV1Mk}ci0*NrJ=t| zCXuJG`#7GBbPceFtFEpl{(lTm`LX=B_!H+& z>$*Hf}}y zkt@nLXFG9%v**s{z&{H4e?aqp%&l#oU8lxUxk2o%K+?aAe6jLojA& z_|J0<-%u^<;NT*%4)n2-OdqfctSl6iCHE?W_Q2zpJken#_xUJlidzs249H=b#g z?}L4-Tnp6)t_5X?_$v)vz`s9@^BME2X@w<>sKZ3=B{%*B$T5Nj%6!-Hr;I!Scj`lH z&2dHFlOISwWJ&S2vf~@I4i~(0*T%OFiuX|eD*nd2utS4$1_JM?zmp>a#CsVy6Er^z zeNNZZDE?R3pM?>~e?H_N`C`hy%m4jb;6L#8=a7l>3eJS2LGgEUxsau-Yh9l~o7=Yh z2mYg3`m5*3Ik|lKQf~euzZlCWzaN&=vHuHtOwK!2@W6)hqq$Zm|7`Nmu%9^F6UH?+ z@2ii+=iJ;ZzhiUKu$QB()nKk3FooI>Jr_IjzY6=qxYy;&mvi7BlQ?t4kRjIhb|2q? zd^K~{-^cxjVSj?!Xs=Da5IHmFzRj!Kzh~b!?`P7c&T9s77VLYB?8_?F zauM^)p;qFG!9PHLfIsnt43UnmV?Wn?Ki7aXSosgq;f?MYUuSIYwOn(5vWhb{f%$pn z4ySN-z}_%7|B);A@PA5k*7kkdr4xZ@s{e9j+9w;*RFm;XPDQwx%~;8iBzSKTIGKO z{53ZZU*OLr@S5=k;?CM^i#zkxs3Sj%z0U`L%q`qM+tP zX$aL;*^g$7UyM2Go+_4A+f)IQcy^G$h2E zb?nT$XlgTEFJI8GN6NQf%-eVn9mPilRqUbT$pN-|;FEjq@Ao&TxpZg=mEgBHB zU@grU;&sfmqlO=6|G3sU;7t8rbK$?X0y_v9$^{X`m4jZ_BR|B|@?ZCLSPPEzz`w1n zP5nA;4(kQFKm%$enjkkBxM%Y}2si&d|62L)U(dCzCGn56HN+i#6|nV-TGIo0;W;`( zW-y=1KF4dp$$mC_|6}pbb>IHoKQeZajXQB>jVR?u`R>%l1o54?6NnS*arpVopdEF; zeC5J3*M0p`*8lif;!irrcjC?(uExejsi~>4wKYwstGY^N@KY}TujLx`S=Cu+T=!dx zKWlPm->I**E{A*q-Z^FFT5$G%7Ij0_*Mo4-y6~RmyTzUB&lfae(WZfO>um}mnsDXPEbau-!13!!xd!qh*{C)6&bz0j1I{>y$D-S)b*)JMCPk!=~KL&6Ngin0p6MCOxF2L_R9t8N!$2Wpced<#`y!F;w zKTi5V_kX&X09wAIJ#anfg9Dhn0s7(C6Nj3S-mVn(i|C6ZAVq0$hE)874co};g z^hR7pe4lU$P;*ggYc4o&UTQC%liCXooIfkI3TNaBV%t~FRr}yHu7kjQ2J*3;e%;iW zvDVCh8=G80KAeyhCuY2LjrC!Od1rvF7h}zszxGV)&!)6ChP5WAjv-zQAMNJIG!JHS zwl?pLxC-V5II#(hQ`l)ZAp&M0xd4%cxmco*MIk?{BD=BK`1vpc}D39|XlV z{c&0oGdDa~TL2FT4lh=~1NL5O-P~0?V2#ie`v^CnANfGUM!b4F=JkCwd7Q`c8Na2q zJGQQk^?6w}Vg9-{|2047((lAV84uN%sK!N2?V(!_1{{v6rdgZl56f0zDMQ+q)jKzzu^ztsVken;=DjAh6G`Cw`Q4G+BjS+n*=KI~^K{W=%t zbD-rN)O4|*Q~@<#@1Vx$E!0W9`B~IZeFn87sHMXD>$M%|Bh93rdGf1lKoX3K651t&nhsl= zXxG|%@8}Bbrlp_u#t*DZX<}_0Yb{A9*1Pd_)LtqNwy6xT4pZrOY{s?N4)pPwT(i#y zT%`lRi8U#Ken4fw>H+N`{f#FF?ZxFlLZg7z7#cr4X>id z{9kUD`d2=w_Zlb{^c`5IOxWCZ1k<0T1D1Z31IU0Q2edsZ1K0xv$pQVYq2KEp&#v#Z z?{m@Lin;*Str(C2sfF^L>{R3cjY`~#)m>Wm$Y|1fzeS0-$(Q^z@} zEO*vlb-^XK9>w&Ef^=Zzo-1AFSP#9zb~X5_+){$(eB4K z8gtW+nl{q+CTh+>v(gWrsP^DB*ge(~Q$AGxJ-eYc1isti%$%nM<_&Ev?%|??PK`$p z{f-PM{Ym8k<$$)(F9)tqzFJ?h&Dk@D?Dt{4CHKJWLs8$zy6+(R)pr@0ur)xY{=uXFFzH_> z-F^tN1y(2hG8V)GpDg%wW0Px_ep~nIjD~*HCSxDi0y`H!`V*~RHs^uQsb1*bK1qGpmd zB1m`Cjw0`nLBF2|umz+a#2X$c?Lj;M?Lj;MUp*d>7j~ayNAyj@SLpeH`)BgRH}byy zyQSat!;U{@O(<<2fp&oQkIy$z`_CQ-)O@RN;QD9T4y|wIJ^%U#(BF%=`i49}j!D-) zkOwPSJaG03SMkE~BzW}b_v>LA&y)EEYO6sbdnTX*$>UF|JhZ&^MSb4}Tgbne_4n+C zwI8U4i~PI>7a3{kVa8|))*%C0|K+bIbmV~a`|G#+`TU#g zXW;bWIcWsQi9c4X*RUDpIfyoPY)2bI-r9)xulm1CJDkQd6u+f)_N=w1ElgEBjprPF z3o?Ly0RVeY_{3~fPVckRMxe2lM8hj!B8F)JO z!`AP6>u>5Y&3o9t0QxBpNE=lJx#NyIbp1gD zzUYBIPYHIv9ngk-Zt~<)62^1Zs1LLYMh@_tP^I7EX-9)Ed0^@y{k65Gp0KRcTmMWw zU|+)qx{#q0SL+4q?Q`i0>COIIF8a0Cf&C`hbMj?LmG9K&iW-?PJt*u)38tTXAP>@R zZL6uH^!RYNq$p>PKz7f-zvg>OKXcZ8h!%Vo@{VUZp|+iUD_xb(N~G|6c#oQK^nHZU zKg#F6<)+`rf~k*Xjjye+syV{bwU2glMMMs-^ss4`bYaVroXzn`YQUd__UlZL_mLs z(vO}k!~(mi|L+(5&;>r<;|OHnbXBE78LruP;{yBxZ6y7K3)nMo-{6PCI7gQi6+rF_ zkPod!Z8n}q46ykrlQS|hVB(}(2Kf7BCZ>Vc;V>ccbk2~NGaf6wGQH@W9&?Zt3v(h*P4xDrN>ex7+jH*+Qg z%^jH$&+*!v{sQ!xkWN4+>|b}qGvEd6ANzgqoVy5Qfws}ef2QqF{iiR5{pT}PS&yjo z>lron#va-p=v;m>WB+XVz|o;UJFdjo5_!RRD|6W{4}A2a#bZv)gS_`b|KsSH)Sd_JIr%<%n06TX&t{&!H#{)?4W9hlJ`R1>FyugOh3=D_{einr zu(Wf`qTkvED+gEULO0I*Hs%f;&=`=X4;N8Ovf28x$A*11`dmfy2=$+PNqX>XcG`h% zJY&A6@&)*WT^rC(Caj}2+|X|6cICm5h0OK0cGB_!wEKFZJU)OQ+TZ1q2bTx9hxnq& z$9ee|f9|0M^)#E&Pr4)f?o&DMM4w>Ksb{hF(0|wh+5_{vPow{V%TFzU2za&gjttNi zIyR9qA56dX52Qbv2aY^g`U7R43-p`#sO1A=KS2aKgfR+Yu^bQ*i-qu z%0mP;Ap)B~zZgO9lG^`325gOf?iUHF{~7jyGC)3L(eL(SQ70VzR~wLN18tnx(Cz2~ zctBl1kI)wAe+cxWHw*NW-d;=pd+>+wd$a@GBju*wFvabSaPtHiT!o#QFC+wBVwYo3s=y;z1jM+M=Fj!FZM>UzpL-eZzOT( zhmZmEfWa=%KE#V3-ZK5#v!Hzd{zc^{ctF~- z>DT-U`}5!fk$aj24`#uGdB7r`>oX5tU|d*b|N3V1lXmv%MGrvE(dXG)^-J*LA>$LE z7kut4`zE)v{@Op|(|@i#c>tM!12FQh?}PfA0`Bp%=%*RiXVzLDXnXtE@4B)5uR}a> zbNU}q+712pIrM`k^odG8dKtG$zwHmQI^c}tfjx5?egx3!e%JRm_64e+>`Ra1IRfLb z1KQ`SxmH{cZfyVS5m(&`{V}Y4j6J{b17`h6KWqZ&hfc(oR zxM%w!$F(mKy05kY&lco3%zvLCxBW+t*rxO+i=qGMvobx0-<7`VUu)ka`){=ew+Ovt zg%52_{&UbkUA8aJPWsk)gYWV4`dnxI%s?7^fGpq{ZQuu=VH{-t7w~K%_E<8`zS;V- zKTho*>;UQQul^1GT^HCt@I-q?)&4!QDgBndn?3sNKYKCQFU4LGKJ$n@Je$&w9@E$X z^p@iJ(v&`1(tq~1zc>0Vow-KR&vm!GUzT?Eqgnc)leZ9p)-Z*C!zqb=-$XG0 z^!8RfuQs5s>Q~qcz92(a_Q+KH?C*vCTr~UdTiR`JGuNH8v(J|FTiSEcPrBpmHRtmd zI2Jng0J=bXK);YY^rM?jzn?~X-Pe`GbAy{D)Y6D&1GY-EBcy%Bq?bKh?A>DD9DD!p z?{q02wno2sraGUkZv5dx+J8)&K$)No43Zr(*S`FEdL!4C)}WE}vJd%{S6-3VUw>Wp z?Aasv`T0^%P$2vE?L+Qhj~qB~K%eW)xH(=b_jU}TLD&BP*Pc9hz@Z=e0nkpLkWl}> z_5J^i(9Z7$(XG9~I3sY)`OGZ#_L06+Dy4E>UstcP-rU@xJ$&rxvo!n1Ao`P~KLU-8 z{zDgN4-&A6N!kPSYbQ&7sLufi`YtE2uN$S?e&5n>Y4(q#|KP!cc1j)T^QrUXMPFaP z_SoYO8S8G}Z$?AL4`;pE?7J5K8yWqy23>cCT2{=-)+A$X^-I9=e!@J@A&-;Ufc)`H}c(VI&;0x zrrGv()5mjP%jXzS{^|29?bLNXS0bC%p!YXI!;O457rjCEEzMkGf~B3$T}dXBO23tP z+Ci>;5UoM?C@bU@f9G1^X3=ly&ZeFH<@|RnOG--A&)fd)AUgjw?%izq{p(KJ`EP0v z2mU)P!+3t@X14DA=E2RR-|p${GZ9ETX=d+kJRZL$nSa0daI@&oUUxnZg0xd_xu>Vz lzF#z5%kSKX?YLH3ll^(hI(_`L*t#Iva2Ede*Z;>H_ \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner2.svg b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner2.svg new file mode 100644 index 000000000..9679c604d --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner3.svg b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner3.svg new file mode 100644 index 000000000..9be2c2503 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner3.svg @@ -0,0 +1 @@ +banner3b \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner4.svg b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner4.svg new file mode 100644 index 000000000..38b3d7cd1 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/images/banner4.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/js/site.js b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/js/site.js new file mode 100644 index 000000000..e069226a1 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/js/site.js @@ -0,0 +1 @@ +// Write your Javascript code. diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/js/site.min.js b/src/dotnet/commands/dotnet-new/CSharp_Web/wwwroot/js/site.min.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/dotnet/commands/dotnet-new/Program.cs b/src/dotnet/commands/dotnet-new/Program.cs index 969dccdd0..ff7f30916 100644 --- a/src/dotnet/commands/dotnet-new/Program.cs +++ b/src/dotnet/commands/dotnet-new/Program.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; +using System.IO.Compression; namespace Microsoft.DotNet.Tools.New { @@ -19,12 +20,6 @@ namespace Microsoft.DotNet.Tools.New return null; } - // filename.extension.template - if (parts.Length > 2 && string.Equals("template", parts[parts.Length - 1], StringComparison.OrdinalIgnoreCase)) - { - return parts[parts.Length - 3] + "." + parts[parts.Length - 2]; - } - // filename.extension return parts[parts.Length - 2] + "." + parts[parts.Length - 1]; } @@ -42,11 +37,23 @@ namespace Microsoft.DotNet.Tools.New { string fileName = GetFileNameFromResourceName(resourceName); - resourceNameToFileName.Add(resourceName, fileName); - if (File.Exists(fileName)) + using (var resource = thisAssembly.GetManifestResourceStream(resourceName)) { - Reporter.Error.WriteLine($"Creating new {languageName} project would override file {fileName}."); - hasFilesToOverride = true; + var archive = new ZipArchive(resource); + + try + { + archive.ExtractToDirectory(Directory.GetCurrentDirectory()); + + File.Move( + Path.Combine(Directory.GetCurrentDirectory(), "project.json.template"), + Path.Combine(Directory.GetCurrentDirectory(), "project.json")); + } + catch (IOException ex) + { + Reporter.Error.WriteLine(ex.Message); + hasFilesToOverride = true; + } } } @@ -56,17 +63,6 @@ namespace Microsoft.DotNet.Tools.New return 1; } - foreach (var kv in resourceNameToFileName) - { - using (var fileStream = File.Create(kv.Value)) - { - using (var resource = thisAssembly.GetManifestResourceStream(kv.Key)) - { - resource.CopyTo(fileStream); - } - } - } - Reporter.Output.WriteLine($"Created new {languageName} project in {Directory.GetCurrentDirectory()}."); return 0; @@ -88,7 +84,7 @@ namespace Microsoft.DotNet.Tools.New var dotnetNew = new NewCommand(); app.OnExecute(() => { - var csharp = new { Name = "C#", Alias = new[] { "c#", "cs", "csharp" }, TemplatePrefix = "CSharp", Templates = new[] { "Console" } }; + var csharp = new { Name = "C#", Alias = new[] { "c#", "cs", "csharp" }, TemplatePrefix = "CSharp", Templates = new[] { "Console", "Web" } }; var fsharp = new { Name = "F#", Alias = new[] { "f#", "fs", "fsharp" }, TemplatePrefix = "FSharp", Templates = new[] { "Console" } }; string languageValue = lang.Value() ?? csharp.Name; diff --git a/src/dotnet/commands/dotnet-new/README.md b/src/dotnet/commands/dotnet-new/README.md index 05592ad73..8968d1f9a 100644 --- a/src/dotnet/commands/dotnet-new/README.md +++ b/src/dotnet/commands/dotnet-new/README.md @@ -29,7 +29,7 @@ Language of project. Defaults to `C##`. Also `csharp` ( `fsharp` ) or `cs` ( `fs `-t`, `--type` -Type of the project. Valid value is "console". +Type of the project. Valid values are "console" and "web". ## EXAMPLES diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 3a1595060..387fe5c73 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -4,18 +4,16 @@ "emitEntryPoint": true, "embed": { "include": [ - "commands/dotnet-new/CSharp_Console/NuGet.Config", - "commands/dotnet-new/CSharp_Console/Program.cs", - "commands/dotnet-new/CSharp_Console/project.json.template", - "commands/dotnet-new/FSharp_Console/NuGet.config", - "commands/dotnet-new/FSharp_Console/Program.fs", - "commands/dotnet-new/FSharp_Console/project.json.template" + "commands/dotnet-new/CSharp_Console.zip", + "commands/dotnet-new/FSharp_Console.zip", + "commands/dotnet-new/CSharp_Web.zip" ] }, "compile": { "exclude": [ "commands/dotnet-new/CSharp_Console/**", - "commands/dotnet-new/FSharp_Console/**" + "commands/dotnet-new/FSharp_Console/**", + "commands/dotnet-new/CSharp_Web/**" ] } }, From 0eb24de0a85eff55e510b34b57edba92cb16ab9d Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 8 Jun 2016 17:59:58 -0500 Subject: [PATCH 23/97] CLI dotnet/versions build info files should be separated between the branches. Adding a "BranchName" branchinfo.txt variable like we have in core-setup. This allows to update the correct path under dotnet/versions/build-info. Also, moving UpdateVersionsRepo into FinalizeBuild. --- branchinfo.txt | 1 + build_projects/dotnet-cli-build/PrepareTargets.cs | 4 ++-- build_projects/dotnet-cli-build/PublishTargets.cs | 15 ++++++--------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/branchinfo.txt b/branchinfo.txt index 714dc774c..ad298977a 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -6,3 +6,4 @@ MINOR_VERSION=0 PATCH_VERSION=0 RELEASE_SUFFIX=preview2 CHANNEL=preview +BRANCH_NAME=rel/1.0.0-preview2 diff --git a/build_projects/dotnet-cli-build/PrepareTargets.cs b/build_projects/dotnet-cli-build/PrepareTargets.cs index 4353addbf..566eabc73 100644 --- a/build_projects/dotnet-cli-build/PrepareTargets.cs +++ b/build_projects/dotnet-cli-build/PrepareTargets.cs @@ -75,9 +75,9 @@ namespace Microsoft.DotNet.Cli.Build ReleaseSuffix = branchInfo["RELEASE_SUFFIX"], CommitCount = commitCount }; - - c.BuildContext["BuildVersion"] = buildVersion; + + c.BuildContext["BranchName"] = branchInfo["BRANCH_NAME"]; c.BuildContext["CommitHash"] = commitHash; c.Info($"Building Version: {buildVersion.SimpleVersion} (NuGet Packages: {buildVersion.NuGetVersion})"); diff --git a/build_projects/dotnet-cli-build/PublishTargets.cs b/build_projects/dotnet-cli-build/PublishTargets.cs index ed0b07264..bd51c3469 100644 --- a/build_projects/dotnet-cli-build/PublishTargets.cs +++ b/build_projects/dotnet-cli-build/PublishTargets.cs @@ -15,8 +15,6 @@ namespace Microsoft.DotNet.Cli.Build private static string Channel { get; set; } - private static string CliVersion { get; set; } - private static string CliNuGetVersion { get; set; } private static string SharedFrameworkNugetVersion { get; set; } @@ -27,7 +25,6 @@ namespace Microsoft.DotNet.Cli.Build AzurePublisherTool = new AzurePublisher(); DebRepoPublisherTool = new DebRepoPublisher(Dirs.Packages); - CliVersion = c.BuildContext.Get("BuildVersion").SimpleVersion; CliNuGetVersion = c.BuildContext.Get("BuildVersion").NuGetVersion; SharedFrameworkNugetVersion = CliDependencyVersions.SharedFrameworkVersion; Channel = c.BuildContext.Get("Channel"); @@ -107,6 +104,8 @@ namespace Microsoft.DotNet.Cli.Build { AzurePublisherTool.PublishStringToBlob($"{Channel}/dnvm/latest.{version}", cliVersion); } + + UpdateVersionsRepo(c); } finally { @@ -288,17 +287,15 @@ namespace Microsoft.DotNet.Cli.Build return c.Success(); } - [Target(nameof(PrepareTargets.Init))] - public static BuildTargetResult UpdateVersionsRepo(BuildTargetContext c) + private static void UpdateVersionsRepo(BuildTargetContext c) { string githubAuthToken = EnvVars.EnsureVariable("GITHUB_PASSWORD"); - string nupkgFilePath = EnvVars.EnsureVariable("NUPKG_FILE_PATH"); - string versionsRepoPath = EnvVars.EnsureVariable("VERSIONS_REPO_PATH"); + string nupkgFilePath = Dirs.Packages; + string branchName = c.BuildContext.Get("BranchName"); + string versionsRepoPath = $"build-info/dotnet/cli/{branchName}/Latest"; VersionRepoUpdater repoUpdater = new VersionRepoUpdater(githubAuthToken); repoUpdater.UpdatePublishedVersions(nupkgFilePath, versionsRepoPath).Wait(); - - return c.Success(); } } } From a2d4f6fed0373e67d34ec8d2d9986524d2d37726 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 8 Jun 2016 16:28:52 -0700 Subject: [PATCH 24/97] Remove use of Microsoft.Extensions.PlatformAbstractions --- src/dotnet/MulticoreJitActivator.cs | 3 --- src/dotnet/MulticoreJitProfilePathCalculator.cs | 4 ++-- test/dotnet-projectmodel-server.Tests/DthTests.cs | 4 ++-- test/dotnet.Tests/GivenThatIWantToManageMulticoreJIT.cs | 4 ++-- test/dotnet.Tests/TestCommandExtensions.cs | 9 +-------- test/dotnet.Tests/project.json | 1 - 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/dotnet/MulticoreJitActivator.cs b/src/dotnet/MulticoreJitActivator.cs index fb9075795..b4d4f9c0f 100644 --- a/src/dotnet/MulticoreJitActivator.cs +++ b/src/dotnet/MulticoreJitActivator.cs @@ -2,12 +2,9 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; -using System.IO; using System.Runtime.Loader; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Tools.Common; -using Microsoft.Extensions.PlatformAbstractions; -using NuGet.Frameworks; namespace Microsoft.DotNet.Cli { diff --git a/src/dotnet/MulticoreJitProfilePathCalculator.cs b/src/dotnet/MulticoreJitProfilePathCalculator.cs index 28f683fd1..85362138b 100644 --- a/src/dotnet/MulticoreJitProfilePathCalculator.cs +++ b/src/dotnet/MulticoreJitProfilePathCalculator.cs @@ -5,7 +5,7 @@ using System; using System.IO; using System.Runtime.InteropServices; using Microsoft.DotNet.Cli.Utils; -using Microsoft.Extensions.PlatformAbstractions; +using Microsoft.DotNet.InternalAbstractions; namespace Microsoft.DotNet.Cli { @@ -32,7 +32,7 @@ namespace Microsoft.DotNet.Cli var version = Product.Version; - var rid = PlatformServices.Default.Runtime.GetRuntimeIdentifier(); + var rid = RuntimeEnvironment.GetRuntimeIdentifier(); _multicoreJitProfilePath = Path.Combine(profileRoot, "optimizationdata", version, rid); } diff --git a/test/dotnet-projectmodel-server.Tests/DthTests.cs b/test/dotnet-projectmodel-server.Tests/DthTests.cs index 96e0d833a..bcb157c8a 100644 --- a/test/dotnet-projectmodel-server.Tests/DthTests.cs +++ b/test/dotnet-projectmodel-server.Tests/DthTests.cs @@ -5,13 +5,13 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ProjectModel.Graph; using Microsoft.DotNet.TestFramework; using Microsoft.DotNet.Tools.Test.Utilities; -using Microsoft.Extensions.PlatformAbstractions; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Xunit; @@ -137,7 +137,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests string expectedUnresolvedDependency, string expectedUnresolvedType) { - if (PlatformServices.Default.Runtime.OperatingSystemPlatform == Platform.Linux) + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { Console.WriteLine("Test is skipped on Linux"); return; diff --git a/test/dotnet.Tests/GivenThatIWantToManageMulticoreJIT.cs b/test/dotnet.Tests/GivenThatIWantToManageMulticoreJIT.cs index cfdfe158a..bc7c16034 100644 --- a/test/dotnet.Tests/GivenThatIWantToManageMulticoreJIT.cs +++ b/test/dotnet.Tests/GivenThatIWantToManageMulticoreJIT.cs @@ -4,13 +4,13 @@ using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.TestFramework; using Microsoft.DotNet.Tools.Test.Utilities; -using Microsoft.Extensions.PlatformAbstractions; using System; using System.IO; using System.Runtime.InteropServices; using Xunit; using Xunit.Abstractions; using FluentAssertions; +using Microsoft.DotNet.InternalAbstractions; namespace Microsoft.DotNet.Tests { @@ -105,7 +105,7 @@ namespace Microsoft.DotNet.Tests private static string GetOptimizationRootPath(string version) { - var rid = PlatformServices.Default.Runtime.GetRuntimeIdentifier(); + var rid = RuntimeEnvironment.GetRuntimeIdentifier(); return RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? $@"Microsoft\dotnet\optimizationdata\{version}\{rid}" diff --git a/test/dotnet.Tests/TestCommandExtensions.cs b/test/dotnet.Tests/TestCommandExtensions.cs index 5cd99dab1..e6618de2c 100644 --- a/test/dotnet.Tests/TestCommandExtensions.cs +++ b/test/dotnet.Tests/TestCommandExtensions.cs @@ -1,15 +1,8 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved.  // Licensed under the MIT license. See LICENSE file in the project root for full license information.  -using Microsoft.DotNet.Cli.Utils; -using Microsoft.DotNet.Tools.Test.Utilities; -using Microsoft.Extensions.PlatformAbstractions; -using System; -using System.IO; using System.Runtime.InteropServices; -using Xunit; -using Xunit.Abstractions; -using FluentAssertions; +using Microsoft.DotNet.Tools.Test.Utilities; namespace Microsoft.DotNet.Tests { diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 51f5122aa..8541c1809 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -16,7 +16,6 @@ "target": "project", "type": "build" }, - "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20581", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, From f43aad780c021afe8cd0a483d843673492197b7f Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 8 Jun 2016 22:56:25 -0500 Subject: [PATCH 25/97] Updating CoreFx, CoreClr, Roslyn, CoreSetup, DiaSymReader to rc3-24208-04, rc3-24208-04, beta1-20160608-03, rc3-004425, rc2-60608-04 respectively --- .../project.json | 2 +- .../DesktopAppWithNativeDep/project.json | 2 +- .../KestrelDesktop/project.json | 2 +- .../KestrelDesktopForce32/project.json | 2 +- .../KestrelDesktopWithRuntimes/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../src/EmptyConsoleApp/project.json | 2 +- .../src/EmptyLibrary/project.json | 2 +- .../src/EmptyNetCoreApp/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../IncompatiblePackageSample/project.json | 2 +- .../src/Project1/project.json | 2 +- .../ToolWithOutputName/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../dotnet-desktop-and-portable/project.json | 2 +- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-portable/project.json | 2 +- .../TestApp1/project.json | 2 +- .../TestApp2/project.json | 2 +- .../AppWithBomGlobalJson/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithDirectDependency/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithNet46AndRoslyn/project.json | 2 +- .../AppWithOutputAssemblyName/project.json | 2 +- .../AppWithToolDependency/project.json | 2 +- .../TestProjects/CompileFail/project.json | 2 +- .../PortableApp_Standalone/project.json | 2 +- .../DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestAppDeps/project.json | 2 +- .../TestAppFullClr/project.json | 2 +- .../TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestProjects/EndToEndTestApp/project.json | 2 +- .../CompileFailApp/project.json | 2 +- .../FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../KestrelPortable/project.json | 2 +- .../KestrelStandalone/project.json | 2 +- .../project.json | 2 +- .../OutputStandardOutputAndError/project.json | 2 +- .../SingleTargetApp/project.json | 2 +- .../SingleTargetP0/project.json | 2 +- .../SingleTargetP1/project.json | 2 +- .../SingleTargetP2/project.json | 2 +- .../TwoTargetApp/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP0/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP1/project.json | 4 ++-- .../TwoTargetGraph/TwoTargetP2/project.json | 4 ++-- .../TwoTargetLargeP0/project.json | 6 +++--- .../TwoTargetLargeP1/project.json | 4 ++-- .../TwoTargetLargeP2/project.json | 4 ++-- .../TwoTargetLargeP3/project.json | 4 ++-- .../TwoTargetLargeP4/project.json | 4 ++-- .../TwoTargetLargeP5/project.json | 4 ++-- .../TwoTargetLargeP6/project.json | 4 ++-- .../PortableTests/PortableApp/project.json | 2 +- .../project.json | 4 ++-- .../PortableAppWithNative/project.json | 2 +- .../PortableTests/StandaloneApp/project.json | 2 +- .../MultipleFrameworkProject/project.json | 8 ++++---- .../NetCoreAppOnlyProject/project.json | 6 +++--- .../ResourcesTests/TestApp/project.json | 2 +- .../TestLibraryWithResources/project.json | 2 +- .../TestAppMultiTarget/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestProjects/TestAppSimple/project.json | 2 +- .../TestProjects/TestAppWithArgs/project.json | 2 +- .../App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestAppWithContentPackage/project.json | 2 +- .../TestAppWithContents/project.json | 2 +- .../TestAppWithLibrary/TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestAppWithResourceDeps/project.json | 12 +++++------ .../TestAppWithScripts/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../TestAppWithUnicodéPath/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../TestLibraryWithConfiguration/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../TestLibraryWithXmlDoc/project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 4 ++-- .../project.json | 6 +++--- .../TestMscorlibReference/project.json | 2 +- .../project.json | 2 +- .../src/L0/project.json | 2 +- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../project.json | 2 +- .../TestProjectWithResource/project.json | 2 +- .../TestLibraryWithRuleSet/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 2 +- .../TestSystemCoreReference/project.json | 2 +- .../TestSystemReference/project.json | 2 +- .../project.json | 6 +++--- .../dotnet-cli-build/CliDependencyVersions.cs | 4 ++-- build_projects/dotnet-cli-build/project.json | 14 ++++++------- .../DependencyVersions.cs | 4 ++-- .../shared-build-targets-utils/project.json | 12 +++++------ .../update-dependencies/project.json | 8 ++++---- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- .../project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 6 +++--- .../project.json | 6 +++--- src/compilers/project.json | 6 +++--- src/dotnet-compile-fsc/project.json | 2 +- .../CSharp_Console/project.json.template | 2 +- .../FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 20 +++++++++---------- test/ArgumentForwardingTests/project.json | 4 ++-- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 4 ++-- test/Kestrel.Tests/project.json | 4 ++-- .../project.json | 6 +++--- .../project.json | 4 ++-- .../project.json | 2 +- .../project.json | 4 ++-- .../project.json | 4 ++-- test/Performance/project.json | 4 ++-- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 4 ++-- .../project.json | 6 +++--- .../TestAppWithFullPdbs/project.json | 2 +- .../TestAppWithPortablePdbs/project.json | 2 +- test/binding-redirects.Tests/project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 4 ++-- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 4 ++-- test/dotnet-compile.UnitTests/project.json | 4 ++-- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 6 +++--- .../project.json | 6 +++--- test/dotnet-publish.Tests/project.json | 6 +++--- test/dotnet-resgen.Tests/project.json | 4 ++-- test/dotnet-run.Tests/project.json | 4 ++-- test/dotnet-run.UnitTests/project.json | 4 ++-- test/dotnet-test.Tests/project.json | 8 ++++---- test/dotnet-test.UnitTests/project.json | 4 ++-- test/dotnet.Tests/project.json | 4 ++-- tools/MultiProjectValidator/project.json | 2 +- 167 files changed, 271 insertions(+), 271 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index 7153da0bc..5a96b509b 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } }, "imports": [ diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json index ebeafb566..d9caa28f3 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "PackageWithFakeNativeDep": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24207-03" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24208-04" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json index 1c5e74a8d..d295711b5 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24207-03" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24208-04" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json index d32ae04b5..248e82b53 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24207-03" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24208-04" }, "buildOptions": { "platform": "anycpu32bitpreferred", diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json index 055d8c5fd..3482db4e6 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24207-03" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24208-04" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json index c2859bb86..3978a519c 100644 --- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json @@ -9,7 +9,7 @@ "frameworks": { "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "imports": [ "portable-net45+win8", diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 0c22df33e..7e20fcdbd 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index a047d8338..28a2d63d7 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415", + "Microsoft.NETCore.App": "1.0.0-rc3-004425", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index ccbe21b01..95995c778 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 52e53c3c1..50d2ef5b1 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json @@ -5,7 +5,7 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index 84e7cc8fc..f3fa24cad 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index f2a1c82d6..d408375f1 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index a09b8f779..bc9f90e45 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415", + "Microsoft.NETCore.App": "1.0.0-rc3-004425", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index 04774b827..eb2c1e826 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index 18ca15755..a8a909a4f 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index 152b87d0e..a384e9d1e 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index 45109ca9a..8c7a6f231 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index 603528e96..618e13d19 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index c429680c2..98d57cff9 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index 3fcfebc63..858d09f6e 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 6afdbbfee..2ed597e3f 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index 2db9c9392..4961fb13f 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index 590ba5b31..01000cbbe 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index 5e2e9f641..a57114b0b 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index bb6563d59..ebef98f02 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004415", + "version": "1.0.0-rc3-004425", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 548855b12..e58998705 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415", + "Microsoft.NETCore.App": "1.0.0-rc3-004425", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index 652259b73..16227cded 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415", + "Microsoft.NETCore.App": "1.0.0-rc3-004425", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index cac99934d..e75ad8add 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004415", + "version": "1.0.0-rc3-004425", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index dadadea10..f764de22a 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004415", + "version": "1.0.0-rc3-004425", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json index 4aad5d5b9..6749079c0 100644 --- a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json +++ b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160606-02" + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160608-03" }, "frameworks": { "net46": {} diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 112922c2a..2258a6981 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 0b2392044..5c6b3e4ed 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 357a083c3..eb53f8bb2 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index 590ba5b31..01000cbbe 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index 416296ab4..d05a74ed7 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index d1c659066..0d51cf7dc 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -9,7 +9,7 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" } }, "net451": {} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 48417e84e..ee0f8d981 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415", + "Microsoft.NETCore.App": "1.0.0-rc3-004425", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index d2646beee..65975ce3f 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415", + "Microsoft.NETCore.App": "1.0.0-rc3-004425", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json index 79366dcab..a714900cf 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json @@ -7,7 +7,7 @@ "dependencies": { "DependencyContextValidator": "1.0.0-*", "System.Diagnostics.Process": { - "version": "4.1.0-rc3-24207-03", + "version": "4.1.0-rc3-24208-04", "type": "build" } }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index fa951b918..5da132f0d 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index 54fb35638..e51d557b0 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json index 7e85bc360..08a056720 100644 --- a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json +++ b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json @@ -2,7 +2,7 @@ "version": "1.0.0", "dependencies": { "TestLibrary": "1.0.0", - "System.IO.Compression": "4.1.0-rc3-24207-03" + "System.IO.Compression": "4.1.0-rc3-24208-04" }, "frameworks": { "net461": {} diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index d71362589..f8b92116e 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index 770946bd3..720694fe1 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index b4c4f796e..ab1267ca7 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004415", + "Microsoft.NETCore.App": "1.0.0-rc3-004425", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index e088a2b40..e3f4f6624 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index 2e42f7c45..eb23ed7c8 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index 23e52c577..5cdbc56d1 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index 5dca6ff9e..d9fe1276d 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index 89b23989b..6a6f723df 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -3,7 +3,7 @@ "outputName": "MyLibrary" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 357a083c3..eb53f8bb2 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index 53a5fcb69..e30230cac 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index a064fe548..4b9af6749 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index 8d198d9cb..307875518 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 0f5b7e21a..42dcb010d 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index 7dc0ceda8..c4554ce0d 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,14 +9,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 658ed585f..51c142d50 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index 3b45b5352..f41107ce9 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index 445f4ec40..17780740c 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index fadb93150..d473b426e 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index 560afb369..ea96dbf38 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index 0cf35df18..7a8edb199 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index 54c9477d0..4c1ba76e1 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index bb852b4cf..6cf057d02 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index 445f4ec40..17780740c 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index 445f4ec40..17780740c 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index 7ff45aa80..2afe62caa 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index 0b24b3f9d..62d9216e8 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -4,14 +4,14 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160606-02" + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160608-03" }, "frameworks": { "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 350649cc3..ca48c8352 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index a0fed8cbf..5f7c307b0 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index 0e92045e5..17d17a4e2 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24207-03", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24208-04", "xunit": "2.1.0" }, "frameworks": { @@ -15,10 +15,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Linq.Expressions": "4.1.0-rc3-24207-03", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03" + "System.Linq.Expressions": "4.1.0-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04" } }, "net451": {} diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index f2e2a34b1..a47fb1ccf 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Linq.Expressions": "4.1.0-rc3-24207-03", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Linq.Expressions": "4.1.0-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index 480290ce1..75a7d04d0 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json index ca71a9761..d9d4e17e8 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index c6ab8daff..8cb2fe578 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004415", + "version": "1.0.0-rc3-004425", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index 372e031b3..d545a7a7f 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index 9052e12db..83837ef08 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index 357a083c3..eb53f8bb2 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 357a083c3..eb53f8bb2 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index d3412a4a3..9e79ca3fd 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index 75de07229..3105abe0b 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index b9a28b003..d0a505e56 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415", + "Microsoft.NETCore.App": "1.0.0-rc3-004425", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index a80ef8e71..86484b0d1 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 977715ae2..1e388e2dd 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index 9052e12db..83837ef08 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index af7854437..d0720c682 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,12 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415", - "Microsoft.CSharp": "4.0.1-rc3-24207-03", - "System.Dynamic.Runtime": "4.0.11-rc3-24207-03", - "System.Reflection.Metadata": "1.3.0-rc3-24207-03", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", - "System.Xml.XmlSerializer": "4.0.11-rc3-24207-03", + "Microsoft.NETCore.App": "1.0.0-rc3-004425", + "Microsoft.CSharp": "4.0.1-rc3-24208-04", + "System.Dynamic.Runtime": "4.0.11-rc3-24208-04", + "System.Reflection.Metadata": "1.3.0-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Xml.XmlSerializer": "4.0.11-rc3-24208-04", "WindowsAzure.Storage": "6.2.2-preview" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 177f4a117..2116328bd 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index 7493a09b0..e3c3e8eab 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 293231d65..1b481885c 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 265304947..ba5f2be66 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json @@ -8,7 +8,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index 2e68650be..8a1414e39 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json @@ -5,7 +5,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index 357a083c3..eb53f8bb2 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 977715ae2..1e388e2dd 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 2914d7b00..5f3de5bfb 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -7,7 +7,7 @@ "net451": {}, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index b800321c9..69fd1c0ee 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index a4cd1f1ed..ac4b64290 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03", + "NETStandard.Library": "1.6.0-rc3-24208-04", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index 32d8ce966..bc4bbd5e1 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json index 1f848a28f..8cf7ab7c4 100644 --- a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json +++ b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json @@ -5,7 +5,7 @@ }, "packInclude": {}, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index be968784b..66d69666f 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json @@ -28,7 +28,7 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json index 1c781b1ac..54574daa1 100644 --- a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json +++ b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json @@ -4,7 +4,7 @@ "xmlDoc": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 02f5b27cb..533ea03dc 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,12 +5,12 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" } }, "net451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24207-03" + "Microsoft.CSharp": "4.0.1-rc3-24208-04" } } }, diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index efb12cb6f..0e6292afc 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,17 +5,17 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" } }, "netcore50": { "dependencies": { - "System.Private.Uri": "4.0.1-rc3-24207-03" + "System.Private.Uri": "4.0.1-rc3-24208-04" } }, "net99": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24207-03" + "Microsoft.CSharp": "4.0.1-rc3-24208-04" } } }, diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index e1df6b2a6..126d0acd0 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index d8721f0a8..bbc437162 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004415", + "version": "1.0.0-rc3-004425", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 7e61552e5..8ede63442 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index d3d56fadf..67604d132 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -3,7 +3,7 @@ "dependencies": { "L12": "1.0.0-*", "L21": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index 076952661..8bda4b69a 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index ca71a9761..d9d4e17e8 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index ca71a9761..d9d4e17e8 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 357a083c3..eb53f8bb2 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 357a083c3..eb53f8bb2 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json index 4844702cd..3a7527c23 100644 --- a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json +++ b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json @@ -6,7 +6,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03", + "NETStandard.Library": "1.6.0-rc3-24208-04", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 076d7fbaa..0a9798c27 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index 9d9c6b45d..0c211751f 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index 0246b57e3..741c34c2a 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415" + "Microsoft.NETCore.App": "1.0.0-rc3-004425" } }, "net451": { diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json index a0799a1b2..15b25723f 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -10,9 +10,9 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03", - "System.Diagnostics.Process": "4.1.0-rc3-24207-03", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04", + "System.Diagnostics.Process": "4.1.0-rc3-24208-04", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index b5adae305..94c0e60db 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004415"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004415-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004425"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004425-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index a48b6c612..7b56a02d0 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -5,13 +5,13 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24207-03", - "Microsoft.CSharp": "4.0.1-rc3-24207-03", - "System.Dynamic.Runtime": "4.0.11-rc3-24207-03", - "System.Reflection.Metadata": "1.3.0-rc3-24207-03", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", - "System.Xml.XmlSerializer": "4.0.11-rc3-24207-03", + "NETStandard.Library": "1.6.0-rc3-24208-04", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04", + "Microsoft.CSharp": "4.0.1-rc3-24208-04", + "System.Dynamic.Runtime": "4.0.11-rc3-24208-04", + "System.Reflection.Metadata": "1.3.0-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Xml.XmlSerializer": "4.0.11-rc3-24208-04", "WindowsAzure.Storage": "6.2.2-preview", "NuGet.CommandLine.XPlat": "3.5.0-beta2-1392", "Microsoft.DotNet.Cli.Build.Framework": { diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 848701e83..4c88e346f 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "1.0.2-rc3-24207-03"; - public static readonly string JitVersion = "1.0.2-rc3-24207-03"; + public static readonly string CoreCLRVersion = "1.0.2-rc3-24208-04"; + public static readonly string JitVersion = "1.0.2-rc3-24208-04"; } } diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json index 8942b334d..ac56e5c12 100644 --- a/build_projects/shared-build-targets-utils/project.json +++ b/build_projects/shared-build-targets-utils/project.json @@ -2,12 +2,12 @@ "version": "1.0.0-*", "description": "Build scripts for dotnet-cli", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03", - "Microsoft.CSharp": "4.0.1-rc3-24207-03", - "System.Dynamic.Runtime": "4.0.11-rc3-24207-03", - "System.Reflection.Metadata": "1.3.0-rc3-24207-03", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", - "System.Xml.XmlSerializer": "4.0.11-rc3-24207-03", + "NETStandard.Library": "1.6.0-rc3-24208-04", + "Microsoft.CSharp": "4.0.1-rc3-24208-04", + "System.Dynamic.Runtime": "4.0.11-rc3-24208-04", + "System.Reflection.Metadata": "1.3.0-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Xml.XmlSerializer": "4.0.11-rc3-24208-04", "WindowsAzure.Storage": "6.2.2-preview", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index fe23003e4..048a0d086 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -5,10 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03", - "Microsoft.CSharp": "4.0.1-rc3-24207-03", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24207-03", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "NETStandard.Library": "1.6.0-rc3-24208-04", + "Microsoft.CSharp": "4.0.1-rc3-24208-04", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index e657176c5..6e53a3a3a 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -26,7 +26,7 @@ "portable-net45+wp80+win8+wpa81+dnxcore50" ], "dependencies": { - "System.Diagnostics.Process": "4.1.0-rc3-24207-03" + "System.Diagnostics.Process": "4.1.0-rc3-24208-04" } } } diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 06ab328f7..857b9115c 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -4,7 +4,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160606-02", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160608-03", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 3cfeffeea..7d3b0f11c 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Linq.Expressions": "4.1.0-rc3-24207-03" + "System.Linq.Expressions": "4.1.0-rc3-24208-04" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index 03ecd1147..c7ac5c489 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -10,14 +10,14 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.AppContext": "4.1.0-rc3-24207-03", - "System.Collections": "4.0.11-rc3-24207-03", - "System.IO": "4.1.0-rc3-24207-03", - "System.IO.FileSystem": "4.0.1-rc3-24207-03", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24207-03", - "System.Runtime.Extensions": "4.1.0-rc3-24207-03", - "System.Runtime.InteropServices": "4.1.0-rc3-24207-03", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24207-03" + "System.AppContext": "4.1.0-rc3-24208-04", + "System.Collections": "4.0.11-rc3-24208-04", + "System.IO": "4.1.0-rc3-24208-04", + "System.IO.FileSystem": "4.0.1-rc3-24208-04", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24208-04", + "System.Runtime.Extensions": "4.1.0-rc3-24208-04", + "System.Runtime.InteropServices": "4.1.0-rc3-24208-04", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24208-04" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index bf5994e50..e452b2d69 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -7,7 +7,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Runtime.Loader": "4.0.0-rc3-24207-03" + "System.Runtime.Loader": "4.0.0-rc3-24208-04" }, "frameworks": { "netstandard1.6": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 4ba68725a..fda9fa0a1 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -10,7 +10,7 @@ "Microsoft.DotNet.Compiler.Common": { "target": "project" }, - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160606-02" + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160608-03" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 57e5eaef3..fc573edd1 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -11,7 +11,7 @@ "Newtonsoft.Json": "9.0.1-beta1", "NuGet.Packaging": "3.5.0-beta2-1392", "NuGet.RuntimeModel": "3.5.0-beta2-1392", - "System.Reflection.Metadata": "1.3.0-rc3-24207-03" + "System.Reflection.Metadata": "1.3.0-rc3-24208-04" }, "frameworks": { "net451": { @@ -33,13 +33,13 @@ "dotnet5.4" ], "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24207-03", - "System.Dynamic.Runtime": "4.0.11-rc3-24207-03", - "System.Runtime.Loader": "4.0.0-rc3-24207-03", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", - "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24207-03", - "System.Threading.Thread": "4.0.0-rc3-24207-03", - "System.Xml.XDocument": "4.0.11-rc3-24207-03" + "Microsoft.CSharp": "4.0.1-rc3-24208-04", + "System.Dynamic.Runtime": "4.0.11-rc3-24208-04", + "System.Runtime.Loader": "4.0.0-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24208-04", + "System.Threading.Thread": "4.0.0-rc3-24208-04", + "System.Xml.XDocument": "4.0.11-rc3-24208-04" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 6a9170412..7fcc62ccb 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -16,9 +16,9 @@ "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { - "System.Diagnostics.Debug": "4.0.11-rc3-24207-03", - "System.Dynamic.Runtime": "4.0.11-rc3-24207-03", - "System.Linq": "4.1.0-rc3-24207-03" + "System.Diagnostics.Debug": "4.0.11-rc3-24208-04", + "System.Dynamic.Runtime": "4.0.11-rc3-24208-04", + "System.Linq": "4.1.0-rc3-24208-04" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index ffd547795..3da554565 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.DiaSymReader": "1.0.8-rc2-60606-01", + "Microsoft.DiaSymReader": "1.0.8-rc2-60608-04", "Microsoft.DiaSymReader.Native": "1.4.0-rc2" }, "frameworks": { @@ -22,8 +22,8 @@ "portable-net45+win8" ], "dependencies": { - "System.Resources.ResourceManager": "4.0.1-rc3-24207-03", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24207-03" + "System.Resources.ResourceManager": "4.0.1-rc3-24208-04", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24208-04" } } }, diff --git a/src/compilers/project.json b/src/compilers/project.json index ab0fe557f..575b2c741 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,10 +6,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160606-02", - "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160606-02", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160608-03", + "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160608-03", "Microsoft.DiaSymReader.Native": "1.4.0-rc2" }, "frameworks": { diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 8d34aed6d..892001092 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index bd0b0d7e3..9ca598e7c 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index 8df4668e9..1c5cc6181 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 387fe5c73..558dca074 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -24,8 +24,8 @@ }, "NuGet.CommandLine.XPlat": "3.5.0-beta2-1392", "Newtonsoft.Json": "9.0.1-beta1", - "System.Text.Encoding.CodePages": "4.0.1-rc3-24207-03", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24207-03", + "System.Text.Encoding.CodePages": "4.0.1-rc3-24208-04", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24208-04", "Microsoft.ApplicationInsights": "2.0.0", "Microsoft.DotNet.ProjectModel": { "target": "project" @@ -41,16 +41,16 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24207-03", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24207-03", - "System.Resources.Writer": "4.0.0-rc3-24207-03", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", - "System.Private.DataContractSerialization": "4.1.1-rc3-24207-03", - "System.Text.RegularExpressions": "4.1.0-rc3-24207-03", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24208-04", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24208-04", + "System.Resources.Writer": "4.0.0-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Private.DataContractSerialization": "4.1.1-rc3-24208-04", + "System.Text.RegularExpressions": "4.1.0-rc3-24208-04", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24207-03", + "version": "4.0.0-rc3-24208-04", "exclude": "compile" } }, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 5e5527128..d0227b124 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 9ffaba739..4e6f106e8 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index b1244844c..411b8cdf6 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index b8b9e2fef..0b9ba6e74 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 98cca3f38..35b843362 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,10 +16,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24207-03", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "NuGet.Versioning": "3.5.0-beta2-1392", "NuGet.Packaging": "3.5.0-beta2-1392", "NuGet.Frameworks": "3.5.0-beta2-1392", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 06e33b4d4..11389b052 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json index a81c05735..52ef1d9c4 100644 --- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Microsoft.DotNet.ProjectModel.Loader": { "target": "project" diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 581ff832f..0bf9f9f6f 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,9 +11,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 884fcb9d2..0e9be9bdd 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,9 +7,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24207-03", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24208-04", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Performance/project.json b/test/Performance/project.json index 243c8d3de..e8ef89967 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index b002866de..cf85c0fa9 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index b42d25f8a..449a6ba16 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,12 +3,12 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index 9d4acb363..e0ed296fc 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,13 +3,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", - "System.Diagnostics.Process": "4.1.0-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Diagnostics.Process": "4.1.0-rc3-24208-04", "TestAppWithPortablePdbs": { "target": "project" }, diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index c487a64bd..160cd7d31 100644 --- a/test/TestingAbstractions/TestAppWithFullPdbs/project.json +++ b/test/TestingAbstractions/TestAppWithFullPdbs/project.json @@ -4,7 +4,7 @@ "debugType": "full" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": {} diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index eddb42577..7145e59a9 100644 --- a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json +++ b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24207-03" + "NETStandard.Library": "1.6.0-rc3-24208-04" }, "frameworks": { "netstandard1.5": {} diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json index 886a01d54..a949479c2 100644 --- a/test/binding-redirects.Tests/project.json +++ b/test/binding-redirects.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24207-03", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24208-04", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" } diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index e308daec8..a795815a5 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 7e4f32c25..69ab59b3c 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index 2abc98899..ec928aa48 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 1ca1fa1bc..9b1ef4a93 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 706472e34..47646eff8 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -23,7 +23,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24207-03", + "version": "4.0.0-rc3-24208-04", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index d9459537a..244958d0b 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 3b519e6e9..3f56dbe0c 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", - "System.IO.Compression.ZipFile": "4.0.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.IO.Compression.ZipFile": "4.0.1-rc3-24208-04", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 38f78d82f..54d168855 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,13 +2,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24207-03", + "version": "4.0.0-rc3-24208-04", "exclude": "Compile" }, "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -19,7 +19,7 @@ }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Net.NameResolution": "4.0.0-rc3-24207-03" + "System.Net.NameResolution": "4.0.0-rc3-24208-04" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index d2059cb36..83987fefc 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.TestFramework": { "target": "project" }, @@ -15,7 +15,7 @@ "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00206", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24207-03" + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24208-04" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index da22c1abd..1615c3ba2 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index b8b9e2fef..0b9ba6e74 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index 0ed15dee4..4dd0d51c4 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index fb28deca1..24268ae7d 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Newtonsoft.Json": "9.0.1-beta1", "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -15,9 +15,9 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc3-24207-03", - "System.Net.Sockets": "4.1.0-rc3-24207-03", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Net.NameResolution": "4.0.0-rc3-24208-04", + "System.Net.Sockets": "4.1.0-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 56320a94a..b0870fdda 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,14 +3,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, "Newtonsoft.Json": "9.0.1-beta1", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24207-03", + "version": "4.0.0-rc3-24208-04", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 8541c1809..5c57c6c3a 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004415" + "version": "1.0.0-rc3-004425" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24207-03", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 26360eba2..c49472e0e 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004415", + "Microsoft.NETCore.App": "1.0.0-rc3-004425", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From 9a9864bf68e9255f56d6b104c0c59c9e2ed0aa93 Mon Sep 17 00:00:00 2001 From: Zhi Li Date: Wed, 8 Jun 2016 18:09:05 -0700 Subject: [PATCH 26/97] Update NuGet Version to 3.5.0-beta2-1451 --- build_projects/dotnet-cli-build/project.json | 2 +- build_projects/update-dependencies/project.json | 2 +- src/Microsoft.DotNet.Cli.Utils/project.json | 8 ++++---- src/Microsoft.DotNet.ProjectModel/project.json | 4 ++-- src/dotnet/project.json | 4 ++-- test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 7b56a02d0..9011966c3 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -13,7 +13,7 @@ "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", "System.Xml.XmlSerializer": "4.0.11-rc3-24208-04", "WindowsAzure.Storage": "6.2.2-preview", - "NuGet.CommandLine.XPlat": "3.5.0-beta2-1392", + "NuGet.CommandLine.XPlat": "3.5.0-beta2-1451", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 048a0d086..89d3f011b 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, - "NuGet.Versioning": "3.5.0-beta2-1392", + "NuGet.Versioning": "3.5.0-beta2-1451", "Newtonsoft.Json": "9.0.1-beta1", "Octokit": "0.18.0", "Microsoft.Net.Http": "2.2.29" diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 6e53a3a3a..18f57d6db 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -8,10 +8,10 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "NuGet.Versioning": "3.5.0-beta2-1392", - "NuGet.Packaging": "3.5.0-beta2-1392", - "NuGet.Frameworks": "3.5.0-beta2-1392", - "NuGet.ProjectModel": "3.5.0-beta2-1392" + "NuGet.Versioning": "3.5.0-beta2-1451", + "NuGet.Packaging": "3.5.0-beta2-1451", + "NuGet.Frameworks": "3.5.0-beta2-1451", + "NuGet.ProjectModel": "3.5.0-beta2-1451" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index fc573edd1..62beaa80f 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -9,8 +9,8 @@ "target": "project" }, "Newtonsoft.Json": "9.0.1-beta1", - "NuGet.Packaging": "3.5.0-beta2-1392", - "NuGet.RuntimeModel": "3.5.0-beta2-1392", + "NuGet.Packaging": "3.5.0-beta2-1451", + "NuGet.RuntimeModel": "3.5.0-beta2-1451", "System.Reflection.Metadata": "1.3.0-rc3-24208-04" }, "frameworks": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 558dca074..87307d7fc 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -19,10 +19,10 @@ }, "dependencies": { "NuGet.Commands": { - "version": "3.5.0-beta2-1392", + "version": "3.5.0-beta2-1451", "exclude": "compile" }, - "NuGet.CommandLine.XPlat": "3.5.0-beta2-1392", + "NuGet.CommandLine.XPlat": "3.5.0-beta2-1451", "Newtonsoft.Json": "9.0.1-beta1", "System.Text.Encoding.CodePages": "4.0.1-rc3-24208-04", "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24208-04", diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 35b843362..91011824f 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -20,10 +20,10 @@ }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24208-04", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", - "NuGet.Versioning": "3.5.0-beta2-1392", - "NuGet.Packaging": "3.5.0-beta2-1392", - "NuGet.Frameworks": "3.5.0-beta2-1392", - "NuGet.ProjectModel": "3.5.0-beta2-1392", + "NuGet.Versioning": "3.5.0-beta2-1451", + "NuGet.Packaging": "3.5.0-beta2-1451", + "NuGet.Frameworks": "3.5.0-beta2-1451", + "NuGet.ProjectModel": "3.5.0-beta2-1451", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From c066ef15404b840000bb64f0676b359d483bb31d Mon Sep 17 00:00:00 2001 From: Zlatko Knezevic Date: Mon, 28 Mar 2016 21:40:15 -0700 Subject: [PATCH 27/97] Add C# Lib and xunittest templates Adding the C# lib and xunittest templates to `dotnet new`. These need to be invoked with the `dotnet new -t lib` and `dotnet new -t xunittest` keywords respectively. --- .../commands/dotnet-new/CSharp_Lib/Library.cs | 11 ++++++++ .../CSharp_Lib/project.json.template | 9 +++++++ .../dotnet-new/CSharp_xunittest/Tests.cs | 14 ++++++++++ .../CSharp_xunittest/project.json.template | 26 +++++++++++++++++++ src/dotnet/commands/dotnet-new/Program.cs | 4 +-- src/dotnet/project.json | 6 ++++- 6 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Lib/Library.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template create mode 100644 src/dotnet/commands/dotnet-new/CSharp_xunittest/Tests.cs create mode 100644 src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template diff --git a/src/dotnet/commands/dotnet-new/CSharp_Lib/Library.cs b/src/dotnet/commands/dotnet-new/CSharp_Lib/Library.cs new file mode 100644 index 000000000..4f54b3889 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Lib/Library.cs @@ -0,0 +1,11 @@ +using System; + +namespace ClassLibrary +{ + public class Class1 + { + public void Method1() + { + } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template new file mode 100644 index 000000000..a0d30a992 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template @@ -0,0 +1,9 @@ +{ + "version": "1.0.0-*", + "dependencies": { + "NETStandard.Library": "1.5.0-rc3-24126-00" + }, + "frameworks": { + "netstandard1.5": {} + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/Tests.cs b/src/dotnet/commands/dotnet-new/CSharp_xunittest/Tests.cs new file mode 100644 index 000000000..1bd5ced4f --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/Tests.cs @@ -0,0 +1,14 @@ +using System; +using Xunit; + +namespace Tests +{ + public class Tests + { + [Fact] + public void Test1() + { + Assert.True(true); + } + } +} diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template new file mode 100644 index 000000000..b77eda023 --- /dev/null +++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template @@ -0,0 +1,26 @@ +{ + "version": "1.0.0-*", + + "dependencies": { + "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24008", + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-dev-140469-38" + }, + + "testRunner": "xunit", + + "frameworks": { + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004312" + } + }, + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] + } + } +} diff --git a/src/dotnet/commands/dotnet-new/Program.cs b/src/dotnet/commands/dotnet-new/Program.cs index ff7f30916..4e971e51a 100644 --- a/src/dotnet/commands/dotnet-new/Program.cs +++ b/src/dotnet/commands/dotnet-new/Program.cs @@ -84,9 +84,9 @@ namespace Microsoft.DotNet.Tools.New var dotnetNew = new NewCommand(); app.OnExecute(() => { - var csharp = new { Name = "C#", Alias = new[] { "c#", "cs", "csharp" }, TemplatePrefix = "CSharp", Templates = new[] { "Console", "Web" } }; + var csharp = new { Name = "C#", Alias = new[] { "c#", "cs", "csharp" }, TemplatePrefix = "CSharp", Templates = new[] { "Console", "Web", "Lib", "xunittest" } }; var fsharp = new { Name = "F#", Alias = new[] { "f#", "fs", "fsharp" }, TemplatePrefix = "FSharp", Templates = new[] { "Console" } }; - + string languageValue = lang.Value() ?? csharp.Name; var language = new[] { csharp, fsharp } diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 558dca074..b20df2cd4 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -5,6 +5,8 @@ "embed": { "include": [ "commands/dotnet-new/CSharp_Console.zip", + "commands/dotnet-new/CSharp_Lib.zip", + "commands/dotnet-new/CSharp_xunittest.zip", "commands/dotnet-new/FSharp_Console.zip", "commands/dotnet-new/CSharp_Web.zip" ] @@ -13,7 +15,9 @@ "exclude": [ "commands/dotnet-new/CSharp_Console/**", "commands/dotnet-new/FSharp_Console/**", - "commands/dotnet-new/CSharp_Web/**" + "commands/dotnet-new/CSharp_Web/**", + "commands/dotnet-new/CSharp_Lib/**", + "commands/dotnet-new/CSharp_xunittest/**" ] } }, From 85e4ed2b74e8cd262d906f5ec5e6ea59835d2c38 Mon Sep 17 00:00:00 2001 From: Zlatko Knezevic Date: Mon, 6 Jun 2016 09:53:26 -0700 Subject: [PATCH 28/97] Responding to PR feedback --- .../commands/dotnet-new/CSharp_Lib/project.json.template | 5 +++-- .../dotnet-new/CSharp_xunittest/project.json.template | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template index a0d30a992..883071de1 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template @@ -1,9 +1,10 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24126-00" }, "frameworks": { - "netstandard1.5": {} + "netstandard1.6": { + "NETStandard.Library": "1.5.0-rc3-24126-00" + } } } diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template index b77eda023..c44728483 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template @@ -2,9 +2,9 @@ "version": "1.0.0-*", "dependencies": { - "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24008", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24127-01", "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-140469-38" + "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, "testRunner": "xunit", From 4b1735bdaf60ac0767e7b2e355a90de826b27cd8 Mon Sep 17 00:00:00 2001 From: Zlatko Knezevic Date: Thu, 9 Jun 2016 08:17:45 -0700 Subject: [PATCH 29/97] Fixing F# template project.json Two changes: 1. Moving from netstandard1.5 to netcoreapp1.0 2. Fixing the version of F# netcore package --- .../commands/dotnet-new/FSharp_Console/project.json.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index 1c5cc6181..c2f8fb633 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -10,7 +10,7 @@ } }, "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160316" + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509" }, "tools": { "dotnet-compile-fsc": { @@ -23,7 +23,7 @@ } }, "frameworks": { - "netstandard1.5": { + "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", From 6ad383666ae19a812546df75d0ee148b1c9b75a8 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Thu, 9 Jun 2016 11:25:14 -0700 Subject: [PATCH 30/97] update product monikers to rc2 --- build_projects/shared-build-targets-utils/Utils/Monikers.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build_projects/shared-build-targets-utils/Utils/Monikers.cs b/build_projects/shared-build-targets-utils/Utils/Monikers.cs index d28723643..5358e1ad9 100644 --- a/build_projects/shared-build-targets-utils/Utils/Monikers.cs +++ b/build_projects/shared-build-targets-utils/Utils/Monikers.cs @@ -10,9 +10,9 @@ namespace Microsoft.DotNet.Cli.Build public class Monikers { public const string SharedFrameworkName = "Microsoft.NETCore.App"; - public const string CLISdkBrandName = "Microsoft .NET Core 1.0.0 RC2 - SDK Preview 1"; - public const string SharedFxBrandName = "Microsoft .NET Core 1.0.0 RC2 - Runtime"; - public const string SharedHostBrandName = "Microsoft .NET Core 1.0.0 RC2 - Host"; + public const string CLISdkBrandName = "Microsoft .NET Core 1.0.0 - SDK Preview 2"; + public const string SharedFxBrandName = "Microsoft .NET Core 1.0.0 - Runtime"; + public const string SharedHostBrandName = "Microsoft .NET Core 1.0.0 - Host"; public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version) { From 1d44105b4bb1920cf90bdb720ad4420f1168e10d Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Thu, 9 Jun 2016 12:05:54 -0700 Subject: [PATCH 31/97] [Fixes #3421] Made dotnet new templates generate portable pdbs --- .../CSharp_Console/project.json.template | 1 + .../CSharp_Lib/project.json.template | 5 ++- .../CSharp_Web/project.json.template | 1 + .../CSharp_xunittest/project.json.template | 42 ++++++++++--------- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index 9ca598e7c..ad874d85a 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -1,6 +1,7 @@ { "version": "1.0.0-*", "buildOptions": { + "debugType": "portable", "emitEntryPoint": true }, "dependencies": {}, diff --git a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template index 883071de1..8b0aefe2a 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template @@ -1,10 +1,13 @@ { "version": "1.0.0-*", + "buildOptions": { + "debugType": "portable" + }, "dependencies": { }, "frameworks": { "netstandard1.6": { - "NETStandard.Library": "1.5.0-rc3-24126-00" + "NETStandard.Library": "1.5.0-rc3-24126-00" } } } diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template index e355cb2d8..18abd54fd 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template @@ -80,6 +80,7 @@ }, "buildOptions": { + "debugType": "portable", "emitEntryPoint": true, "preserveCompilationContext": true }, diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template index c44728483..93b79608d 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template @@ -1,26 +1,28 @@ { - "version": "1.0.0-*", + "version": "1.0.0-*", + "buildOptions": { + "debugType": "portable" + }, + "dependencies": { + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24127-01", + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-rc2-192208-24" + }, - "dependencies": { - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24127-01", - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-rc2-192208-24" - }, + "testRunner": "xunit", - "testRunner": "xunit", - - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc3-004312" - } - }, - "imports": [ - "dotnet5.4", - "portable-net451+win8" - ] + "frameworks": { + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004312" } + }, + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } + } } From abcaa595de9d27a1758247365530ae2109e5d878 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 9 Jun 2016 15:38:23 -0500 Subject: [PATCH 32/97] Publish symbol.nupkg files to myget. Fix #3445 --- build_projects/dotnet-cli-build/PackageTargets.cs | 14 +------------- .../shared-build-targets-utils/Utils/Dirs.cs | 1 - 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/build_projects/dotnet-cli-build/PackageTargets.cs b/build_projects/dotnet-cli-build/PackageTargets.cs index 41014ad20..20ffe99cd 100644 --- a/build_projects/dotnet-cli-build/PackageTargets.cs +++ b/build_projects/dotnet-cli-build/PackageTargets.cs @@ -199,7 +199,6 @@ namespace Microsoft.DotNet.Cli.Build var packagingBuildBasePath = Path.Combine(Dirs.Stage2Compilation, "forPackaging"); - FS.Mkdirp(Dirs.PackagesIntermediate); FS.Mkdirp(Dirs.Packages); foreach (var projectName in ProjectsToPack) @@ -210,24 +209,13 @@ namespace Microsoft.DotNet.Cli.Build projectFile, "--no-build", "--build-base-path", packagingBuildBasePath, - "--output", Dirs.PackagesIntermediate, + "--output", Dirs.Packages, "--configuration", configuration, "--version-suffix", versionSuffix) .Execute() .EnsureSuccessful(); } - var packageFiles = Directory.EnumerateFiles(Dirs.PackagesIntermediate, "*.nupkg"); - - foreach (var packageFile in packageFiles) - { - if (!packageFile.EndsWith(".symbols.nupkg")) - { - var destinationPath = Path.Combine(Dirs.Packages, Path.GetFileName(packageFile)); - File.Copy(packageFile, destinationPath, overwrite: true); - } - } - return c.Success(); } diff --git a/build_projects/shared-build-targets-utils/Utils/Dirs.cs b/build_projects/shared-build-targets-utils/Utils/Dirs.cs index b602469cd..766568022 100644 --- a/build_projects/shared-build-targets-utils/Utils/Dirs.cs +++ b/build_projects/shared-build-targets-utils/Utils/Dirs.cs @@ -16,7 +16,6 @@ namespace Microsoft.DotNet.Cli.Build RuntimeEnvironment.GetRuntimeIdentifier()); public static readonly string Intermediate = Path.Combine(Output, "intermediate"); - public static readonly string PackagesIntermediate = Path.Combine(Output, "packages/intermediate"); public static readonly string PackagesNoRID = Path.Combine(RepoRoot, "artifacts", "packages"); public static readonly string Packages = Path.Combine(Output, "packages"); public static readonly string Stage1 = Path.Combine(Output, "stage1"); From 1dc6b0e2dd4d39b9a5f86b5d359f05474c6585eb Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Thu, 9 Jun 2016 15:05:27 -0700 Subject: [PATCH 33/97] Make the nuget cache local to the repo (#3370) * fixes #3368 * Update build nuget cache to be in the repo --- .gitignore | 3 +++ .../dotnet-cli-build/PrepareTargets.cs | 18 +++--------------- build_projects/dotnet-cli-build/build.ps1 | 1 + build_projects/dotnet-cli-build/build.sh | 3 +++ .../shared-build-targets-utils/Utils/Dirs.cs | 6 +----- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index cca89b49e..bae5bb22d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,9 @@ # NuGet keeps dropping Library/ +# local nuget cache +.nuget/ + # NuGet v3 restore drops these even though we don't use MSBuild :( *.nuget.targets *.nuget.props diff --git a/build_projects/dotnet-cli-build/PrepareTargets.cs b/build_projects/dotnet-cli-build/PrepareTargets.cs index 566eabc73..98c776947 100644 --- a/build_projects/dotnet-cli-build/PrepareTargets.cs +++ b/build_projects/dotnet-cli-build/PrepareTargets.cs @@ -261,21 +261,9 @@ namespace Microsoft.DotNet.Cli.Build public static BuildTargetResult CheckPackageCache(BuildTargetContext c) { var ciBuild = string.Equals(Environment.GetEnvironmentVariable("CI_BUILD"), "1", StringComparison.Ordinal); - - if (ciBuild) - { - // On CI, HOME is redirected under the repo, which gets deleted after every build. - // So make NUGET_PACKAGES outside of the repo. - var nugetPackages = Path.GetFullPath(Path.Combine(c.BuildContext.BuildDirectory, "..", ".nuget", "packages")); - Environment.SetEnvironmentVariable("NUGET_PACKAGES", nugetPackages); - Dirs.NuGetPackages = nugetPackages; - } - - // Set the package cache location in NUGET_PACKAGES just to be safe - if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("NUGET_PACKAGES"))) - { - Environment.SetEnvironmentVariable("NUGET_PACKAGES", Dirs.NuGetPackages); - } + + // Always set the package cache location local to the build + Environment.SetEnvironmentVariable("NUGET_PACKAGES", Dirs.NuGetPackages); CleanNuGetTempCache(); diff --git a/build_projects/dotnet-cli-build/build.ps1 b/build_projects/dotnet-cli-build/build.ps1 index 0f27922a7..73f5f5e9d 100644 --- a/build_projects/dotnet-cli-build/build.ps1 +++ b/build_projects/dotnet-cli-build/build.ps1 @@ -25,6 +25,7 @@ if($Help) $env:CONFIGURATION = $Configuration; $RepoRoot = "$PSScriptRoot\..\.." +$env:NUGET_PACKAGES = "$RepoRoot\.nuget\packages" if($NoPackage) { diff --git a/build_projects/dotnet-cli-build/build.sh b/build_projects/dotnet-cli-build/build.sh index 412013fef..2ec1a8a24 100755 --- a/build_projects/dotnet-cli-build/build.sh +++ b/build_projects/dotnet-cli-build/build.sh @@ -57,6 +57,9 @@ while [[ $# > 0 ]]; do shift done +# Set nuget package cache under the repo +export NUGET_PACKAGES="$REPOROOT/.nuget/packages" + # Set up the environment to be used for building with clang. if which "clang-3.5" > /dev/null 2>&1; then export CC="$(which clang-3.5)" diff --git a/build_projects/shared-build-targets-utils/Utils/Dirs.cs b/build_projects/shared-build-targets-utils/Utils/Dirs.cs index b602469cd..5e5f9d3a5 100644 --- a/build_projects/shared-build-targets-utils/Utils/Dirs.cs +++ b/build_projects/shared-build-targets-utils/Utils/Dirs.cs @@ -45,11 +45,7 @@ namespace Microsoft.DotNet.Cli.Build private static string GetNuGetPackagesDir() { - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - return Path.Combine(Environment.GetEnvironmentVariable("USERPROFILE"), ".nuget", "packages"); - } - return Path.Combine(Environment.GetEnvironmentVariable("HOME"), ".nuget", "packages"); + return Path.Combine(Dirs.RepoRoot, ".nuget", "packages"); } } } From cd9bcd40b3dc96e8c6b718fc6e04b1e409cae998 Mon Sep 17 00:00:00 2001 From: eerhardt Date: Fri, 10 Jun 2016 01:56:21 +0000 Subject: [PATCH 34/97] Updating CoreFx, CoreClr, CoreSetup to rc3-24209-08, rc3-24208-04, rc3-3004442-00 respectively --- .../project.json | 2 +- .../DesktopAppWithNativeDep/project.json | 2 +- .../KestrelDesktop/project.json | 2 +- .../KestrelDesktopForce32/project.json | 2 +- .../KestrelDesktopWithRuntimes/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../src/EmptyConsoleApp/project.json | 2 +- .../src/EmptyLibrary/project.json | 2 +- .../src/EmptyNetCoreApp/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../IncompatiblePackageSample/project.json | 2 +- .../src/Project1/project.json | 2 +- .../ToolWithOutputName/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../dotnet-desktop-and-portable/project.json | 2 +- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-portable/project.json | 2 +- .../TestApp1/project.json | 2 +- .../TestApp2/project.json | 2 +- .../AppWithBomGlobalJson/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithDirectDependency/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithOutputAssemblyName/project.json | 2 +- .../AppWithToolDependency/project.json | 2 +- .../TestProjects/CompileFail/project.json | 2 +- .../PortableApp_Standalone/project.json | 2 +- .../DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestAppDeps/project.json | 2 +- .../TestAppFullClr/project.json | 2 +- .../TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestProjects/EndToEndTestApp/project.json | 2 +- .../CompileFailApp/project.json | 2 +- .../FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../KestrelPortable/project.json | 2 +- .../KestrelStandalone/project.json | 2 +- .../project.json | 2 +- .../OutputStandardOutputAndError/project.json | 2 +- .../SingleTargetApp/project.json | 2 +- .../SingleTargetP0/project.json | 2 +- .../SingleTargetP1/project.json | 2 +- .../SingleTargetP2/project.json | 2 +- .../TwoTargetApp/project.json | 4 ++-- .../TwoTargetGraph/TwoTargetP0/project.json | 4 ++-- .../TwoTargetGraph/TwoTargetP1/project.json | 4 ++-- .../TwoTargetGraph/TwoTargetP2/project.json | 4 ++-- .../TwoTargetLargeP0/project.json | 4 ++-- .../TwoTargetLargeP1/project.json | 4 ++-- .../TwoTargetLargeP2/project.json | 4 ++-- .../TwoTargetLargeP3/project.json | 4 ++-- .../TwoTargetLargeP4/project.json | 4 ++-- .../TwoTargetLargeP5/project.json | 4 ++-- .../TwoTargetLargeP6/project.json | 4 ++-- .../PortableTests/PortableApp/project.json | 2 +- .../project.json | 2 +- .../PortableAppWithNative/project.json | 2 +- .../PortableTests/StandaloneApp/project.json | 2 +- .../MultipleFrameworkProject/project.json | 8 ++++---- .../NetCoreAppOnlyProject/project.json | 6 +++--- .../ResourcesTests/TestApp/project.json | 2 +- .../TestLibraryWithResources/project.json | 2 +- .../TestAppMultiTarget/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestProjects/TestAppSimple/project.json | 2 +- .../TestProjects/TestAppWithArgs/project.json | 2 +- .../App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestAppWithContentPackage/project.json | 2 +- .../TestAppWithContents/project.json | 2 +- .../TestAppWithLibrary/TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestAppWithResourceDeps/project.json | 12 +++++------ .../TestAppWithScripts/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../TestAppWithUnicodéPath/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../TestLibraryWithConfiguration/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../TestLibraryWithXmlDoc/project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 4 ++-- .../project.json | 6 +++--- .../TestMscorlibReference/project.json | 2 +- .../project.json | 2 +- .../src/L0/project.json | 2 +- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../project.json | 2 +- .../TestProjectWithResource/project.json | 2 +- .../TestLibraryWithRuleSet/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 2 +- .../TestSystemCoreReference/project.json | 2 +- .../TestSystemReference/project.json | 2 +- .../project.json | 6 +++--- .../dotnet-cli-build/CliDependencyVersions.cs | 4 ++-- build_projects/dotnet-cli-build/project.json | 12 +++++------ .../shared-build-targets-utils/project.json | 12 +++++------ .../update-dependencies/project.json | 6 +++--- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 6 +++--- .../project.json | 4 ++-- src/compilers/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- .../CSharp_Console/project.json.template | 2 +- .../CSharp_xunittest/project.json.template | 6 ++---- .../FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 20 +++++++++---------- test/ArgumentForwardingTests/project.json | 4 ++-- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 4 ++-- test/Kestrel.Tests/project.json | 4 ++-- .../project.json | 6 +++--- .../project.json | 4 ++-- .../project.json | 2 +- .../project.json | 4 ++-- .../project.json | 4 ++-- test/Performance/project.json | 4 ++-- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 4 ++-- .../project.json | 6 +++--- .../TestAppWithFullPdbs/project.json | 2 +- .../TestAppWithPortablePdbs/project.json | 2 +- test/binding-redirects.Tests/project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 4 ++-- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 4 ++-- test/dotnet-compile.UnitTests/project.json | 4 ++-- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 6 +++--- .../project.json | 6 +++--- test/dotnet-publish.Tests/project.json | 6 +++--- test/dotnet-resgen.Tests/project.json | 4 ++-- test/dotnet-run.Tests/project.json | 4 ++-- test/dotnet-run.UnitTests/project.json | 4 ++-- test/dotnet-test.Tests/project.json | 8 ++++---- test/dotnet-test.UnitTests/project.json | 4 ++-- test/dotnet.Tests/project.json | 4 ++-- tools/MultiProjectValidator/project.json | 2 +- 164 files changed, 259 insertions(+), 261 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index 5a96b509b..193291a6b 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } }, "imports": [ diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json index d9caa28f3..5ee014e12 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "PackageWithFakeNativeDep": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24208-04" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24209-08" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json index d295711b5..56e2a75bd 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24208-04" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24209-08" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json index 248e82b53..57615720e 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24208-04" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24209-08" }, "buildOptions": { "platform": "anycpu32bitpreferred", diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json index 3482db4e6..3662fed2f 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24208-04" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24209-08" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json index 3978a519c..ed09e9f8d 100644 --- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json @@ -9,7 +9,7 @@ "frameworks": { "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "imports": [ "portable-net45+win8", diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 7e20fcdbd..0b0b77381 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 28a2d63d7..87442ad84 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425", + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index 95995c778..43f0e6683 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 50d2ef5b1..627b1fffa 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json @@ -5,7 +5,7 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index f3fa24cad..0067fa1a0 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index d408375f1..a031ef8e2 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index bc9f90e45..07a3f2b4a 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425", + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index eb2c1e826..224689330 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index a8a909a4f..b7e2267ec 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index a384e9d1e..1382cc88c 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index 8c7a6f231..6071d3843 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index 618e13d19..4b9d12076 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index 98d57cff9..f5e5f4eef 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index 858d09f6e..edcd6eda5 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 2ed597e3f..91b4cb654 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index 4961fb13f..e4d101948 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index 01000cbbe..4aee39c83 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index a57114b0b..5a4d31945 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index ebef98f02..9521e3a9f 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004425", + "version": "1.0.0-rc3-004442-00", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index e58998705..06fbbd2b1 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425", + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index 16227cded..2b6319863 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425", + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index e75ad8add..379b7f030 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004425", + "version": "1.0.0-rc3-004442-00", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index f764de22a..5149e62bc 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004425", + "version": "1.0.0-rc3-004442-00", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 2258a6981..23a14cae8 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 5c6b3e4ed..637a4bf65 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index eb53f8bb2..08b8a6722 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index 01000cbbe..4aee39c83 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index d05a74ed7..a78779114 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 0d51cf7dc..cb6b75c7d 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -9,7 +9,7 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" } }, "net451": {} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index ee0f8d981..0fcf320ea 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425", + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index 65975ce3f..93644f4fb 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425", + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json index a714900cf..95471276f 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json @@ -7,7 +7,7 @@ "dependencies": { "DependencyContextValidator": "1.0.0-*", "System.Diagnostics.Process": { - "version": "4.1.0-rc3-24208-04", + "version": "4.1.0-rc3-24209-08", "type": "build" } }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 5da132f0d..30fac4258 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index e51d557b0..fd2008f4c 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json index 08a056720..87489cbe3 100644 --- a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json +++ b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json @@ -2,7 +2,7 @@ "version": "1.0.0", "dependencies": { "TestLibrary": "1.0.0", - "System.IO.Compression": "4.1.0-rc3-24208-04" + "System.IO.Compression": "4.1.0-rc3-24209-08" }, "frameworks": { "net461": {} diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index f8b92116e..c6c82cb11 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index 720694fe1..1d8d40be0 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index ab1267ca7..787964ad7 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004425", + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index e3f4f6624..01ad8ac36 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index eb23ed7c8..e0d1fec5a 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index 5cdbc56d1..cee7f7266 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index d9fe1276d..e983a5116 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index 6a6f723df..6af751275 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -3,7 +3,7 @@ "outputName": "MyLibrary" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index eb53f8bb2..08b8a6722 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index e30230cac..12efcf456 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index 4b9af6749..a946c38af 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index 307875518..f9901bde5 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 42dcb010d..6412d9292 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index c4554ce0d..094121d5f 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,13 +9,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04", + "NETStandard.Library": "1.6.0-rc3-24209-08", "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04" } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 51c142d50..fd4d6b772 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04", + "NETStandard.Library": "1.6.0-rc3-24209-08", "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04" } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index f41107ce9..5793d6d89 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index 17780740c..c59302d63 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index d473b426e..11fcf5d9f 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04", + "NETStandard.Library": "1.6.0-rc3-24209-08", "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04" } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index ea96dbf38..3cdb2e569 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index 7a8edb199..437768a2d 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index 4c1ba76e1..f4246b090 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index 6cf057d02..881d3789a 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index 17780740c..c59302d63 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index 17780740c..c59302d63 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index 2afe62caa..119d6ecce 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index 62d9216e8..16da51534 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index ca48c8352..d4bc822d8 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index 5f7c307b0..87268aa8d 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index 17d17a4e2..4f8630f6e 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24208-04", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24209-08", "xunit": "2.1.0" }, "frameworks": { @@ -15,10 +15,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Linq.Expressions": "4.1.0-rc3-24208-04", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04" + "System.Linq.Expressions": "4.1.0-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08" } }, "net451": {} diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index a47fb1ccf..5e76cbdc1 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Linq.Expressions": "4.1.0-rc3-24208-04", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Linq.Expressions": "4.1.0-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index 75a7d04d0..eafe8e270 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json index d9d4e17e8..b9862ca37 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 8cb2fe578..dd64ca3b3 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004425", + "version": "1.0.0-rc3-004442-00", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index d545a7a7f..604d1dcfc 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index 83837ef08..c6b29a9e5 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index eb53f8bb2..08b8a6722 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index eb53f8bb2..08b8a6722 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index 9e79ca3fd..0f2eb73a1 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index 3105abe0b..e048f1722 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index d0a505e56..5929fb684 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425", + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 86484b0d1..4140948ce 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 1e388e2dd..2ef78fa2c 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index 83837ef08..c6b29a9e5 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index d0720c682..a9741c826 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,12 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425", - "Microsoft.CSharp": "4.0.1-rc3-24208-04", - "System.Dynamic.Runtime": "4.0.11-rc3-24208-04", - "System.Reflection.Metadata": "1.3.0-rc3-24208-04", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", - "System.Xml.XmlSerializer": "4.0.11-rc3-24208-04", + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", + "Microsoft.CSharp": "4.0.1-rc3-24209-08", + "System.Dynamic.Runtime": "4.0.11-rc3-24209-08", + "System.Reflection.Metadata": "1.3.0-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Xml.XmlSerializer": "4.0.11-rc3-24209-08", "WindowsAzure.Storage": "6.2.2-preview" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 2116328bd..7c5bcf64a 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index e3c3e8eab..5dc95f742 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 1b481885c..3fddd022d 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index ba5f2be66..3d65d829c 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json @@ -8,7 +8,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index 8a1414e39..24b793632 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json @@ -5,7 +5,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index eb53f8bb2..08b8a6722 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 1e388e2dd..2ef78fa2c 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 5f3de5bfb..65e2da5cf 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -7,7 +7,7 @@ "net451": {}, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 69fd1c0ee..83939f184 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index ac4b64290..2dc50f1ad 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04", + "NETStandard.Library": "1.6.0-rc3-24209-08", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index bc4bbd5e1..3e32e5bb8 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json index 8cf7ab7c4..a1058d262 100644 --- a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json +++ b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json @@ -5,7 +5,7 @@ }, "packInclude": {}, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index 66d69666f..00f88511e 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json @@ -28,7 +28,7 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json index 54574daa1..0f661e341 100644 --- a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json +++ b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json @@ -4,7 +4,7 @@ "xmlDoc": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 533ea03dc..448a1f2a1 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,12 +5,12 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" } }, "net451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24208-04" + "Microsoft.CSharp": "4.0.1-rc3-24209-08" } } }, diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index 0e6292afc..e3f60fb44 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,17 +5,17 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" } }, "netcore50": { "dependencies": { - "System.Private.Uri": "4.0.1-rc3-24208-04" + "System.Private.Uri": "4.0.1-rc3-24209-08" } }, "net99": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24208-04" + "Microsoft.CSharp": "4.0.1-rc3-24209-08" } } }, diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 126d0acd0..22ee5f373 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index bbc437162..f533ea141 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004425", + "version": "1.0.0-rc3-004442-00", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 8ede63442..0bcafe1d3 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index 67604d132..fd56a6bd3 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -3,7 +3,7 @@ "dependencies": { "L12": "1.0.0-*", "L21": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index 8bda4b69a..d12c934ee 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index d9d4e17e8..b9862ca37 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index d9d4e17e8..b9862ca37 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index eb53f8bb2..08b8a6722 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index eb53f8bb2..08b8a6722 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json index 3a7527c23..7e7a67683 100644 --- a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json +++ b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json @@ -6,7 +6,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04", + "NETStandard.Library": "1.6.0-rc3-24209-08", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 0a9798c27..76029d5ba 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index 0c211751f..7948d8838 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index 741c34c2a..54b01da2a 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" } }, "net451": { diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json index 15b25723f..ddeee0610 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -10,9 +10,9 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04", - "System.Diagnostics.Process": "4.1.0-rc3-24208-04", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08", + "System.Diagnostics.Process": "4.1.0-rc3-24209-08", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index 94c0e60db..9fe9eed1c 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004425"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004425-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004442-00"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004442-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 9011966c3..cf0027e0f 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -5,13 +5,13 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04", + "NETStandard.Library": "1.6.0-rc3-24209-08", "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04", - "Microsoft.CSharp": "4.0.1-rc3-24208-04", - "System.Dynamic.Runtime": "4.0.11-rc3-24208-04", - "System.Reflection.Metadata": "1.3.0-rc3-24208-04", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", - "System.Xml.XmlSerializer": "4.0.11-rc3-24208-04", + "Microsoft.CSharp": "4.0.1-rc3-24209-08", + "System.Dynamic.Runtime": "4.0.11-rc3-24209-08", + "System.Reflection.Metadata": "1.3.0-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Xml.XmlSerializer": "4.0.11-rc3-24209-08", "WindowsAzure.Storage": "6.2.2-preview", "NuGet.CommandLine.XPlat": "3.5.0-beta2-1451", "Microsoft.DotNet.Cli.Build.Framework": { diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json index ac56e5c12..4ec1546d7 100644 --- a/build_projects/shared-build-targets-utils/project.json +++ b/build_projects/shared-build-targets-utils/project.json @@ -2,12 +2,12 @@ "version": "1.0.0-*", "description": "Build scripts for dotnet-cli", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04", - "Microsoft.CSharp": "4.0.1-rc3-24208-04", - "System.Dynamic.Runtime": "4.0.11-rc3-24208-04", - "System.Reflection.Metadata": "1.3.0-rc3-24208-04", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", - "System.Xml.XmlSerializer": "4.0.11-rc3-24208-04", + "NETStandard.Library": "1.6.0-rc3-24209-08", + "Microsoft.CSharp": "4.0.1-rc3-24209-08", + "System.Dynamic.Runtime": "4.0.11-rc3-24209-08", + "System.Reflection.Metadata": "1.3.0-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Xml.XmlSerializer": "4.0.11-rc3-24209-08", "WindowsAzure.Storage": "6.2.2-preview", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 89d3f011b..68da02d29 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -5,10 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04", - "Microsoft.CSharp": "4.0.1-rc3-24208-04", + "NETStandard.Library": "1.6.0-rc3-24209-08", + "Microsoft.CSharp": "4.0.1-rc3-24209-08", "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 18f57d6db..456daf003 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -26,7 +26,7 @@ "portable-net45+wp80+win8+wpa81+dnxcore50" ], "dependencies": { - "System.Diagnostics.Process": "4.1.0-rc3-24208-04" + "System.Diagnostics.Process": "4.1.0-rc3-24209-08" } } } diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 7d3b0f11c..8f1938026 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Linq.Expressions": "4.1.0-rc3-24208-04" + "System.Linq.Expressions": "4.1.0-rc3-24209-08" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index c7ac5c489..bf0eccd13 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -10,14 +10,14 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.AppContext": "4.1.0-rc3-24208-04", - "System.Collections": "4.0.11-rc3-24208-04", - "System.IO": "4.1.0-rc3-24208-04", - "System.IO.FileSystem": "4.0.1-rc3-24208-04", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24208-04", - "System.Runtime.Extensions": "4.1.0-rc3-24208-04", - "System.Runtime.InteropServices": "4.1.0-rc3-24208-04", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24208-04" + "System.AppContext": "4.1.0-rc3-24209-08", + "System.Collections": "4.0.11-rc3-24209-08", + "System.IO": "4.1.0-rc3-24209-08", + "System.IO.FileSystem": "4.0.1-rc3-24209-08", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24209-08", + "System.Runtime.Extensions": "4.1.0-rc3-24209-08", + "System.Runtime.InteropServices": "4.1.0-rc3-24209-08", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24209-08" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index e452b2d69..d33017d68 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -7,7 +7,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Runtime.Loader": "4.0.0-rc3-24208-04" + "System.Runtime.Loader": "4.0.0-rc3-24209-08" }, "frameworks": { "netstandard1.6": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 62beaa80f..2b2174d60 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -11,7 +11,7 @@ "Newtonsoft.Json": "9.0.1-beta1", "NuGet.Packaging": "3.5.0-beta2-1451", "NuGet.RuntimeModel": "3.5.0-beta2-1451", - "System.Reflection.Metadata": "1.3.0-rc3-24208-04" + "System.Reflection.Metadata": "1.3.0-rc3-24209-08" }, "frameworks": { "net451": { @@ -33,13 +33,13 @@ "dotnet5.4" ], "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24208-04", - "System.Dynamic.Runtime": "4.0.11-rc3-24208-04", - "System.Runtime.Loader": "4.0.0-rc3-24208-04", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", - "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24208-04", - "System.Threading.Thread": "4.0.0-rc3-24208-04", - "System.Xml.XDocument": "4.0.11-rc3-24208-04" + "Microsoft.CSharp": "4.0.1-rc3-24209-08", + "System.Dynamic.Runtime": "4.0.11-rc3-24209-08", + "System.Runtime.Loader": "4.0.0-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24209-08", + "System.Threading.Thread": "4.0.0-rc3-24209-08", + "System.Xml.XDocument": "4.0.11-rc3-24209-08" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 7fcc62ccb..215049fb2 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -16,9 +16,9 @@ "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { - "System.Diagnostics.Debug": "4.0.11-rc3-24208-04", - "System.Dynamic.Runtime": "4.0.11-rc3-24208-04", - "System.Linq": "4.1.0-rc3-24208-04" + "System.Diagnostics.Debug": "4.0.11-rc3-24209-08", + "System.Dynamic.Runtime": "4.0.11-rc3-24209-08", + "System.Linq": "4.1.0-rc3-24209-08" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 3da554565..928bcb9a6 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -22,8 +22,8 @@ "portable-net45+win8" ], "dependencies": { - "System.Resources.ResourceManager": "4.0.1-rc3-24208-04", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24208-04" + "System.Resources.ResourceManager": "4.0.1-rc3-24209-08", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24209-08" } } }, diff --git a/src/compilers/project.json b/src/compilers/project.json index 575b2c741..4dcad2feb 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160608-03", "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160608-03", diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 892001092..ddbec9255 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index ad874d85a..8ed2f7d2e 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template index 93b79608d..cbf56727d 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template @@ -4,19 +4,17 @@ "debugType": "portable" }, "dependencies": { - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24127-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, - "testRunner": "xunit", - "frameworks": { "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004312" + "version": "1.0.0-rc3-004442-00" } }, "imports": [ diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index c2f8fb633..bb71cf044 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 8ed9d9b86..1bf4bf047 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -28,8 +28,8 @@ }, "NuGet.CommandLine.XPlat": "3.5.0-beta2-1451", "Newtonsoft.Json": "9.0.1-beta1", - "System.Text.Encoding.CodePages": "4.0.1-rc3-24208-04", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24208-04", + "System.Text.Encoding.CodePages": "4.0.1-rc3-24209-08", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24209-08", "Microsoft.ApplicationInsights": "2.0.0", "Microsoft.DotNet.ProjectModel": { "target": "project" @@ -45,16 +45,16 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24208-04", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24208-04", - "System.Resources.Writer": "4.0.0-rc3-24208-04", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", - "System.Private.DataContractSerialization": "4.1.1-rc3-24208-04", - "System.Text.RegularExpressions": "4.1.0-rc3-24208-04", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24209-08", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24209-08", + "System.Resources.Writer": "4.0.0-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Private.DataContractSerialization": "4.1.1-rc3-24209-08", + "System.Text.RegularExpressions": "4.1.0-rc3-24209-08", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24208-04", + "version": "4.0.0-rc3-24209-08", "exclude": "compile" } }, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index d0227b124..081df8bf4 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 4e6f106e8..0a20abe94 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 411b8cdf6..8e285fda9 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index 0b9ba6e74..d22576793 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 91011824f..130de9658 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,10 +16,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24208-04", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "NuGet.Versioning": "3.5.0-beta2-1451", "NuGet.Packaging": "3.5.0-beta2-1451", "NuGet.Frameworks": "3.5.0-beta2-1451", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 11389b052..e1019eb72 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json index 52ef1d9c4..9efcf35d5 100644 --- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.DotNet.ProjectModel.Loader": { "target": "project" diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 0bf9f9f6f..bd3f45b0e 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,9 +11,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 0e9be9bdd..08ac69d74 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,9 +7,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24208-04", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Performance/project.json b/test/Performance/project.json index e8ef89967..165e430a3 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index cf85c0fa9..c45c8c440 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index 449a6ba16..785bf28a9 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,12 +3,12 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index e0ed296fc..f6e24a430 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,13 +3,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", - "System.Diagnostics.Process": "4.1.0-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Diagnostics.Process": "4.1.0-rc3-24209-08", "TestAppWithPortablePdbs": { "target": "project" }, diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index 160cd7d31..f5b521b20 100644 --- a/test/TestingAbstractions/TestAppWithFullPdbs/project.json +++ b/test/TestingAbstractions/TestAppWithFullPdbs/project.json @@ -4,7 +4,7 @@ "debugType": "full" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": {} diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index 7145e59a9..940e0e499 100644 --- a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json +++ b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24209-08" }, "frameworks": { "netstandard1.5": {} diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json index a949479c2..79b57da33 100644 --- a/test/binding-redirects.Tests/project.json +++ b/test/binding-redirects.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24208-04", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" } diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index a795815a5..06669a34d 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 69ab59b3c..0bca16fdc 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index ec928aa48..6fd58efe4 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 9b1ef4a93..7cc1bcf2a 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 47646eff8..c4ac7cde6 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -23,7 +23,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24208-04", + "version": "4.0.0-rc3-24209-08", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index 244958d0b..2c33c6289 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 3f56dbe0c..70700b91d 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", - "System.IO.Compression.ZipFile": "4.0.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.IO.Compression.ZipFile": "4.0.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 54d168855..a468ec17b 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,13 +2,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24208-04", + "version": "4.0.0-rc3-24209-08", "exclude": "Compile" }, "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -19,7 +19,7 @@ }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Net.NameResolution": "4.0.0-rc3-24208-04" + "System.Net.NameResolution": "4.0.0-rc3-24209-08" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 83987fefc..842db69c2 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.TestFramework": { "target": "project" }, @@ -15,7 +15,7 @@ "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00206", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24208-04" + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24209-08" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 1615c3ba2..93e962be4 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 0b9ba6e74..d22576793 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index 4dd0d51c4..bbba861a0 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 24268ae7d..4336ff680 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Newtonsoft.Json": "9.0.1-beta1", "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -15,9 +15,9 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc3-24208-04", - "System.Net.Sockets": "4.1.0-rc3-24208-04", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Net.NameResolution": "4.0.0-rc3-24209-08", + "System.Net.Sockets": "4.1.0-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index b0870fdda..419a9f36c 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,14 +3,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, "Newtonsoft.Json": "9.0.1-beta1", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24208-04", + "version": "4.0.0-rc3-24209-08", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 5c57c6c3a..9550fe992 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004425" + "version": "1.0.0-rc3-004442-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24208-04", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index c49472e0e..88b94fbba 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004425", + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From ef4a8e85ef7e798e814a618f99d98a52f12bdb5c Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 10 Jun 2016 01:09:46 -0500 Subject: [PATCH 35/97] Updating CoreSetup to rc3-004443-00. --- .../AppWithDirectDependencyDesktopAndPortable/project.json | 2 +- .../TestProjectWithUnresolvedDependency/project.json | 2 +- .../DthTestProjects/src/BrokenProjectPathSample/project.json | 2 +- .../DthTestProjects/src/EmptyConsoleApp/project.json | 2 +- .../DthTestProjects/src/EmptyNetCoreApp/project.json | 2 +- .../DthTestProjects/src/FailReleaseProject/project.json | 2 +- .../src/IncompatiblePackageSample/project.json | 2 +- .../IncorrectGlobalJson/src/Project1/project.json | 2 +- TestAssets/TestPackages/ToolWithOutputName/project.json | 2 +- .../TestPackages/dotnet-dependency-context-test/project.json | 2 +- .../TestPackages/dotnet-dependency-tool-invoker/project.json | 2 +- .../TestPackages/dotnet-desktop-and-portable/project.json | 2 +- .../TestPackages/dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-hello/v2/dotnet-hello/project.json | 2 +- TestAssets/TestPackages/dotnet-portable/project.json | 2 +- .../TestProjects/AppWithAppDependency/TestApp1/project.json | 2 +- .../TestProjects/AppWithAppDependency/TestApp2/project.json | 2 +- TestAssets/TestProjects/AppWithBomGlobalJson/project.json | 2 +- .../AppWithDependencyOnToolWithOutputName/project.json | 2 +- .../TestProjects/AppWithDirectAndToolDependency/project.json | 2 +- TestAssets/TestProjects/AppWithDirectDependency/project.json | 2 +- .../AppWithDirectDependencyAndTypeBuild/project.json | 2 +- .../AppWithDirectDependencyWithOutputName/project.json | 2 +- .../TestProjects/AppWithOutputAssemblyName/project.json | 2 +- TestAssets/TestProjects/AppWithToolDependency/project.json | 2 +- TestAssets/TestProjects/CompileFail/project.json | 2 +- .../DependencyChangeTest/PortableApp_Standalone/project.json | 2 +- .../TestProjects/DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/TestApp/project.json | 2 +- .../DependencyContextValidator/TestAppDeps/project.json | 2 +- .../DependencyContextValidator/TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- TestAssets/TestProjects/EndToEndTestApp/project.json | 2 +- .../FSharpTestProjects/CompileFailApp/project.json | 2 +- .../TestProjects/FSharpTestProjects/TestApp/project.json | 2 +- .../FSharpTestProjects/TestAppWithArgs/project.json | 2 +- .../TestProjects/KestrelSample/KestrelPortable/project.json | 2 +- .../TestProjects/KestrelSample/KestrelStandalone/project.json | 2 +- .../TestProjects/OutputStandardOutputAndError/project.json | 2 +- .../PerformanceTestProjects/SingleTargetApp/project.json | 2 +- .../SingleTargetGraph/SingleTargetP0/project.json | 2 +- .../SingleTargetGraph/SingleTargetP1/project.json | 2 +- .../SingleTargetGraph/SingleTargetP2/project.json | 2 +- .../PerformanceTestProjects/TwoTargetApp/project.json | 2 +- .../TwoTargetGraph/TwoTargetP0/project.json | 2 +- .../TwoTargetGraph/TwoTargetP1/project.json | 2 +- .../TwoTargetGraph/TwoTargetP2/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP0/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP1/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP2/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP3/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP4/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP5/project.json | 2 +- .../TwoTargetGraphLarge/TwoTargetLargeP6/project.json | 2 +- .../TestProjects/PortableTests/PortableApp/project.json | 2 +- .../PortableTests/PortableAppCompilationContext/project.json | 2 +- .../PortableTests/PortableAppWithNative/project.json | 2 +- .../TestProjects/PortableTests/StandaloneApp/project.json | 2 +- .../ProjectsWithTests/MultipleFrameworkProject/project.json | 2 +- .../ProjectsWithTests/NetCoreAppOnlyProject/project.json | 2 +- TestAssets/TestProjects/ResourcesTests/TestApp/project.json | 2 +- .../TestProjects/RunTestsApps/TestAppMultiTarget/project.json | 2 +- .../TestAppCompilationContext/TestApp/project.json | 2 +- TestAssets/TestProjects/TestAppSimple/project.json | 2 +- TestAssets/TestProjects/TestAppWithArgs/project.json | 2 +- .../TestProjects/TestAppWithBuildDependency/App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestProjects/TestAppWithContentPackage/project.json | 2 +- TestAssets/TestProjects/TestAppWithContents/project.json | 2 +- .../TestProjects/TestAppWithLibrary/TestApp/project.json | 2 +- TestAssets/TestProjects/TestAppWithResourceDeps/project.json | 2 +- TestAssets/TestProjects/TestAppWithScripts/project.json | 2 +- .../TestAppWithTransitiveAppDependency/TestApp/project.json | 2 +- TestAssets/TestProjects/TestAppWithUnicodéPath/project.json | 2 +- .../TestAppWithWrapperProjectDependency/TestApp/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestProjects/TestMicrosoftCSharpReference/project.json | 2 +- .../TestMicrosoftCSharpReferenceMissingFramework/project.json | 2 +- TestAssets/TestProjects/TestMscorlibReference/project.json | 2 +- .../TestProjectContextBuildAllDedupe/project.json | 2 +- .../TestProjectToProjectDependencies/src/L0/project.json | 2 +- .../TestProjectWithCultureSpecificResource/project.json | 2 +- TestAssets/TestProjects/TestProjectWithResource/project.json | 2 +- TestAssets/TestProjects/TestSimpleIncrementalApp/project.json | 2 +- TestAssets/TestProjects/TestSystemCoreReference/project.json | 2 +- TestAssets/TestProjects/TestSystemReference/project.json | 2 +- build_projects/dotnet-cli-build/CliDependencyVersions.cs | 4 ++-- src/compilers/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- .../commands/dotnet-new/CSharp_Console/project.json.template | 2 +- .../dotnet-new/CSharp_xunittest/project.json.template | 2 +- .../commands/dotnet-new/FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 2 +- test/ArgumentForwardingTests/project.json | 2 +- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 2 +- test/Kestrel.Tests/project.json | 2 +- test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 2 +- test/Microsoft.DotNet.Compiler.Common.Tests/project.json | 2 +- test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json | 2 +- test/Microsoft.DotNet.ProjectModel.Tests/project.json | 2 +- test/Microsoft.Extensions.DependencyModel.Tests/project.json | 2 +- test/Performance/project.json | 2 +- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 2 +- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 2 +- test/dotnet-compile.UnitTests/project.json | 2 +- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 2 +- test/dotnet-projectmodel-server.Tests/project.json | 2 +- test/dotnet-publish.Tests/project.json | 2 +- test/dotnet-resgen.Tests/project.json | 2 +- test/dotnet-run.Tests/project.json | 2 +- test/dotnet-run.UnitTests/project.json | 2 +- test/dotnet-test.Tests/project.json | 2 +- test/dotnet-test.UnitTests/project.json | 2 +- test/dotnet.Tests/project.json | 2 +- tools/MultiProjectValidator/project.json | 2 +- 122 files changed, 123 insertions(+), 123 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index 193291a6b..e04a6aa46 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } }, "imports": [ diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 0b0b77381..a84158710 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 87442ad84..9c23fb1ef 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index 43f0e6683..a0f071265 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index 0067fa1a0..666712955 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index a031ef8e2..2e99e2f13 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 07a3f2b4a..94fdfd248 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index 224689330..bfb41b61c 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index b7e2267ec..1b7eceadf 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index 1382cc88c..f8d68a1b4 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index 6071d3843..34ae4612d 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index 4b9d12076..ea5ca7d96 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index f5e5f4eef..8191c34d1 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index edcd6eda5..f3056fd4e 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 91b4cb654..8f1cb7015 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index e4d101948..527b95e08 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index 4aee39c83..9e7231501 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index 5a4d31945..99b2b7110 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index 9521e3a9f..373865b76 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004442-00", + "version": "1.0.0-rc3-004443-00", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 06fbbd2b1..39020d1b2 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index 2b6319863..e6062b776 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index 379b7f030..6d9491aee 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004442-00", + "version": "1.0.0-rc3-004443-00", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index 5149e62bc..f7d2318fb 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004442-00", + "version": "1.0.0-rc3-004443-00", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 23a14cae8..cae8f21a9 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 637a4bf65..71d826241 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 08b8a6722..da6529ab9 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index 4aee39c83..9e7231501 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index a78779114..f6211af73 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 0fcf320ea..0346b2112 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index 93644f4fb..1d71ceb08 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 30fac4258..821de92bb 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index fd2008f4c..6341777d0 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index c6c82cb11..20fc90c72 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index 1d8d40be0..b8f86f1c2 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index 787964ad7..611b960eb 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 01ad8ac36..2c76c7add 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index cee7f7266..f14599a12 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index e983a5116..e648bf414 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 08b8a6722..da6529ab9 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index 12efcf456..4b2877f28 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index a946c38af..008c431db 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index f9901bde5..8f29a011d 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 6412d9292..34de781b6 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index 094121d5f..c22117304 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index fd4d6b772..bb92373c8 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index 5793d6d89..5316cd29b 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index c59302d63..718b8d97e 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 11fcf5d9f..93352eabf 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index 3cdb2e569..7be7cc2bb 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index 437768a2d..bcc3cf6b2 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index f4246b090..10ca44a36 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index 881d3789a..d29d48820 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,7 +13,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index c59302d63..718b8d97e 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index c59302d63..718b8d97e 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index 119d6ecce..362f16e1b 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index 16da51534..f63a6b162 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index d4bc822d8..e09fa40dd 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index 87268aa8d..8126141c8 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index 4f8630f6e..b7dae4c31 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -15,7 +15,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Linq.Expressions": "4.1.0-rc3-24209-08", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08" diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index 5e76cbdc1..1f507e845 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Linq.Expressions": "4.1.0-rc3-24209-08", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index eafe8e270..57b0c3919 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index dd64ca3b3..8212cf2b5 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004442-00", + "version": "1.0.0-rc3-004443-00", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index 604d1dcfc..1a97c45a9 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index 08b8a6722..da6529ab9 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 08b8a6722..da6529ab9 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index 0f2eb73a1..a1d2cfe62 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index e048f1722..9d091a0ca 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index 5929fb684..7e6eb6bc2 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 4140948ce..bbce94799 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 2ef78fa2c..31a72f408 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index a9741c826..be1abb76d 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", "Microsoft.CSharp": "4.0.1-rc3-24209-08", "System.Dynamic.Runtime": "4.0.11-rc3-24209-08", "System.Reflection.Metadata": "1.3.0-rc3-24209-08", diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 7c5bcf64a..dd8b98e86 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index 5dc95f742..8019573e1 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index 08b8a6722..da6529ab9 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 2ef78fa2c..31a72f408 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 83939f184..bf03f49f5 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 448a1f2a1..4e30414eb 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,7 +5,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" } }, "net451": { diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index e3f60fb44..0991fac94 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,7 +5,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" } }, "netcore50": { diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 22ee5f373..52b160307 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index f533ea141..c6eca6041 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004442-00", + "version": "1.0.0-rc3-004443-00", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 0bcafe1d3..d3742dfeb 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 08b8a6722..da6529ab9 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 08b8a6722..da6529ab9 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 76029d5ba..706e937d4 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index 7948d8838..23e659e68 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index 54b01da2a..36cfe7cdb 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" } }, "net451": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index 9fe9eed1c..fa3657328 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004442-00"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004442-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004443-00"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004443-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/src/compilers/project.json b/src/compilers/project.json index 4dcad2feb..0aa3a493f 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160608-03", "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160608-03", diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index ddbec9255..141b5d8a8 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index 8ed2f7d2e..3a381ef50 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template index cbf56727d..223cd7bbe 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template @@ -14,7 +14,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } }, "imports": [ diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index bb71cf044..dbb08841c 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 1bf4bf047..5998d69e1 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -45,7 +45,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24209-08", "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24209-08", diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 081df8bf4..a62144c92 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.ProjectModel": { diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 0a20abe94..a6cae437e 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 8e285fda9..9000dd3c5 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.ProjectModel": { diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index d22576793..251fe14bf 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 130de9658..27f13d7ff 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,7 +16,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24209-08", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index e1019eb72..61b27061e 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json index 9efcf35d5..1975808cd 100644 --- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.DotNet.ProjectModel.Loader": { "target": "project" diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index bd3f45b0e..5c3c57bd0 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.ProjectModel": { diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 08ac69d74..7d569641d 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/Performance/project.json b/test/Performance/project.json index 165e430a3..2a9148217 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.ProjectModel": { diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index c45c8c440..0eaabc63e 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index 785bf28a9..725eaff9e 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index f6e24a430..b566825b4 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index 06669a34d..b52d0316e 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 0bca16fdc..992dac993 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index 6fd58efe4..11f35dbd5 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 7cc1bcf2a..b47ade012 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index c4ac7cde6..e6655bcf4 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index 2c33c6289..ce735426f 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 70700b91d..83bad7bd7 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "System.IO.Compression.ZipFile": "4.0.1-rc3-24209-08", diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index a468ec17b..39feebcbc 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "dotnet": { "target": "project" diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 842db69c2..db733f349 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.TestFramework": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 93e962be4..b0354eeea 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index d22576793..251fe14bf 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index bbba861a0..da956cad8 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "dotnet": { diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 4336ff680..db95fa520 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Newtonsoft.Json": "9.0.1-beta1", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 419a9f36c..096e2093c 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "Newtonsoft.Json": "9.0.1-beta1", "dotnet": { diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 9550fe992..1c6a51c1b 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0-rc3-004443-00" }, "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", "Microsoft.DotNet.Tools.Tests.Utilities": { diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 88b94fbba..ab629300d 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From dc8f59e29ba494b4a0a6b10730df5e4048e3c13c Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 10 Jun 2016 03:16:25 -0500 Subject: [PATCH 36/97] Fix the VersionRepoUpdater to handle symbols.nupkg files correctly. --- .../VersionRepoUpdater.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/build_projects/shared-build-targets-utils/VersionRepoUpdater.cs b/build_projects/shared-build-targets-utils/VersionRepoUpdater.cs index e85f4262d..f1906776d 100644 --- a/build_projects/shared-build-targets-utils/VersionRepoUpdater.cs +++ b/build_projects/shared-build-targets-utils/VersionRepoUpdater.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build { public class VersionRepoUpdater { - private static Regex s_nugetFileRegex = new Regex("^(.*?)\\.(([0-9]+\\.)?[0-9]+\\.[0-9]+(-([A-z0-9-]+))?)\\.nupkg$"); + private static Regex s_nugetFileRegex = new Regex("^(?.*?)\\.(?([0-9]+\\.)?[0-9]+\\.[0-9]+(-(?[A-z0-9-]+))?)(?\\.symbols)?\\.nupkg$"); private string _gitHubAuthToken; private string _gitHubUser; @@ -68,12 +68,16 @@ namespace Microsoft.DotNet.Cli.Build { Match match = s_nugetFileRegex.Match(Path.GetFileName(filePath)); - packages.Add(new NuGetPackageInfo() + // only look for non-symbols packages + if (string.IsNullOrEmpty(match.Groups["symbols"].Value)) { - Id = match.Groups[1].Value, - Version = match.Groups[2].Value, - Prerelease = match.Groups[5].Value, - }); + packages.Add(new NuGetPackageInfo() + { + Id = match.Groups["id"].Value, + Version = match.Groups["version"].Value, + Prerelease = match.Groups["prerelease"].Value, + }); + } } return packages; From 013fa1b8c0e98d0504ad5095b457622a79319cc4 Mon Sep 17 00:00:00 2001 From: Todd Moscinski Date: Thu, 9 Jun 2016 09:30:10 -0700 Subject: [PATCH 37/97] Removing the nuspec schema change used for adding the serviceable tag. --- .../commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs | 8 +------- .../commands/dotnet-pack/NuGet/ManifestVersionUtility.cs | 7 ------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs index f839f8c19..defcd12cc 100644 --- a/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs +++ b/src/dotnet/commands/dotnet-pack/NuGet/ManifestSchemaUtility.cs @@ -41,19 +41,13 @@ namespace NuGet /// internal const string SchemaVersionV6 = "http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd"; - /// - /// Added serviceble element under metadata. - /// - internal const string SchemaVersionV8 = "http://schemas.microsoft.com/packaging/2016/06/nuspec.xsd"; - private static readonly string[] VersionToSchemaMappings = new[] { SchemaVersionV1, SchemaVersionV2, SchemaVersionV3, SchemaVersionV4, SchemaVersionV5, - SchemaVersionV6, - SchemaVersionV8 + SchemaVersionV6 }; public static int GetVersionFromNamespace(string @namespace) diff --git a/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs b/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs index ce4665153..ee765128b 100644 --- a/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs +++ b/src/dotnet/commands/dotnet-pack/NuGet/ManifestVersionUtility.cs @@ -15,9 +15,6 @@ namespace NuGet public const int TargetFrameworkSupportForDependencyContentsAndToolsVersion = 4; public const int TargetFrameworkSupportForReferencesVersion = 5; public const int XdtTransformationVersion = 6; - // Note that this version should change from 7 to 8 when the PackageType - // schema is merged into here - public const int ServiceableVersion = 7; public static int GetManifestVersion(ManifestMetadata metadata) { @@ -27,10 +24,6 @@ namespace NuGet private static int GetMaxVersionFromMetadata(ManifestMetadata metadata) { // Important: always add newer version checks at the top - if (metadata.Serviceable) - { - return ServiceableVersion; - } bool referencesHasTargetFramework = metadata.PackageAssemblyReferences != null && From 7b51f28c7fbf3c32b3d227cedcdf80c82df7a8f5 Mon Sep 17 00:00:00 2001 From: eerhardt Date: Fri, 10 Jun 2016 15:05:30 +0000 Subject: [PATCH 38/97] Updating CoreFx, CoreClr, CoreSetup to rc3-24210-06, rc3-24210-01, rc3-3004449-00 respectively --- .../project.json | 2 +- .../DesktopAppWithNativeDep/project.json | 2 +- .../KestrelDesktop/project.json | 2 +- .../KestrelDesktopForce32/project.json | 2 +- .../KestrelDesktopWithRuntimes/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../src/EmptyConsoleApp/project.json | 2 +- .../src/EmptyLibrary/project.json | 2 +- .../src/EmptyNetCoreApp/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../IncompatiblePackageSample/project.json | 2 +- .../src/Project1/project.json | 2 +- .../ToolWithOutputName/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../dotnet-desktop-and-portable/project.json | 2 +- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-portable/project.json | 2 +- .../TestApp1/project.json | 2 +- .../TestApp2/project.json | 2 +- .../AppWithBomGlobalJson/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithDirectDependency/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithOutputAssemblyName/project.json | 2 +- .../AppWithToolDependency/project.json | 2 +- .../TestProjects/CompileFail/project.json | 2 +- .../PortableApp_Standalone/project.json | 2 +- .../DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestAppDeps/project.json | 2 +- .../TestAppFullClr/project.json | 2 +- .../TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestProjects/EndToEndTestApp/project.json | 2 +- .../CompileFailApp/project.json | 2 +- .../FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../KestrelPortable/project.json | 2 +- .../KestrelStandalone/project.json | 2 +- .../project.json | 2 +- .../OutputStandardOutputAndError/project.json | 2 +- .../SingleTargetApp/project.json | 2 +- .../SingleTargetP0/project.json | 2 +- .../SingleTargetP1/project.json | 2 +- .../SingleTargetP2/project.json | 2 +- .../TwoTargetApp/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP0/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP1/project.json | 4 ++-- .../TwoTargetGraph/TwoTargetP2/project.json | 4 ++-- .../TwoTargetLargeP0/project.json | 6 +++--- .../TwoTargetLargeP1/project.json | 4 ++-- .../TwoTargetLargeP2/project.json | 4 ++-- .../TwoTargetLargeP3/project.json | 4 ++-- .../TwoTargetLargeP4/project.json | 4 ++-- .../TwoTargetLargeP5/project.json | 4 ++-- .../TwoTargetLargeP6/project.json | 4 ++-- .../PortableTests/PortableApp/project.json | 2 +- .../project.json | 2 +- .../PortableAppWithNative/project.json | 2 +- .../PortableTests/StandaloneApp/project.json | 2 +- .../MultipleFrameworkProject/project.json | 8 ++++---- .../NetCoreAppOnlyProject/project.json | 6 +++--- .../ResourcesTests/TestApp/project.json | 2 +- .../TestLibraryWithResources/project.json | 2 +- .../TestAppMultiTarget/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestProjects/TestAppSimple/project.json | 2 +- .../TestProjects/TestAppWithArgs/project.json | 2 +- .../App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestAppWithContentPackage/project.json | 2 +- .../TestAppWithContents/project.json | 2 +- .../TestAppWithLibrary/TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestAppWithResourceDeps/project.json | 12 +++++------ .../TestAppWithScripts/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../TestAppWithUnicodéPath/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../TestLibraryWithConfiguration/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../TestLibraryWithXmlDoc/project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 4 ++-- .../project.json | 6 +++--- .../TestMscorlibReference/project.json | 2 +- .../project.json | 2 +- .../src/L0/project.json | 2 +- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../project.json | 2 +- .../TestProjectWithResource/project.json | 2 +- .../TestLibraryWithRuleSet/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 2 +- .../TestSystemCoreReference/project.json | 2 +- .../TestSystemReference/project.json | 2 +- .../project.json | 6 +++--- .../dotnet-cli-build/CliDependencyVersions.cs | 4 ++-- build_projects/dotnet-cli-build/project.json | 14 ++++++------- .../DependencyVersions.cs | 4 ++-- .../shared-build-targets-utils/project.json | 12 +++++------ .../update-dependencies/project.json | 8 ++++---- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 6 +++--- .../project.json | 4 ++-- src/compilers/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- .../CSharp_Console/project.json.template | 2 +- .../CSharp_xunittest/project.json.template | 4 ++-- .../FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 20 +++++++++---------- test/ArgumentForwardingTests/project.json | 4 ++-- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 4 ++-- test/Kestrel.Tests/project.json | 4 ++-- .../project.json | 6 +++--- .../project.json | 4 ++-- .../project.json | 2 +- .../project.json | 4 ++-- .../project.json | 4 ++-- test/Performance/project.json | 4 ++-- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 4 ++-- .../project.json | 6 +++--- .../TestAppWithFullPdbs/project.json | 2 +- .../TestAppWithPortablePdbs/project.json | 2 +- test/binding-redirects.Tests/project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 4 ++-- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 4 ++-- test/dotnet-compile.UnitTests/project.json | 4 ++-- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 6 +++--- .../project.json | 6 +++--- test/dotnet-publish.Tests/project.json | 6 +++--- test/dotnet-resgen.Tests/project.json | 4 ++-- test/dotnet-run.Tests/project.json | 4 ++-- test/dotnet-run.UnitTests/project.json | 4 ++-- test/dotnet-test.Tests/project.json | 8 ++++---- test/dotnet-test.UnitTests/project.json | 4 ++-- test/dotnet.Tests/project.json | 4 ++-- tools/MultiProjectValidator/project.json | 2 +- 165 files changed, 266 insertions(+), 266 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index e04a6aa46..a07adc28f 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } }, "imports": [ diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json index 5ee014e12..9b12dcdb5 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "PackageWithFakeNativeDep": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24209-08" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-06" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json index 56e2a75bd..777e408c5 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24209-08" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-06" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json index 57615720e..bccf6287a 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24209-08" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-06" }, "buildOptions": { "platform": "anycpu32bitpreferred", diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json index 3662fed2f..dd994e5ba 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24209-08" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-06" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json index ed09e9f8d..ee4c1d872 100644 --- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json @@ -9,7 +9,7 @@ "frameworks": { "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "imports": [ "portable-net45+win8", diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index a84158710..cbbba9295 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 9c23fb1ef..26e4d7a7d 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index a0f071265..ee30d4087 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 627b1fffa..8ec93433a 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json @@ -5,7 +5,7 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index 666712955..5d23df488 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index 2e99e2f13..d4aeb27bc 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index 94fdfd248..df914c402 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index bfb41b61c..bf267f20b 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index 1b7eceadf..6742eac6a 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index f8d68a1b4..22597e53e 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index 34ae4612d..8fb758ec0 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index ea5ca7d96..30dec4f13 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index 8191c34d1..ccc4a71e6 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index f3056fd4e..5dc1c16d0 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index 8f1cb7015..d691cac2c 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index 527b95e08..6bf4fed39 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index 9e7231501..d343434a6 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index 99b2b7110..ab25a2470 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index 373865b76..4b0013bd9 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004443-00", + "version": "1.0.0-rc3-004449-00", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 39020d1b2..841e94893 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index e6062b776..a1802ac8c 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index 6d9491aee..1e0d3bcc9 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004443-00", + "version": "1.0.0-rc3-004449-00", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index f7d2318fb..a022034f5 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004443-00", + "version": "1.0.0-rc3-004449-00", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index cae8f21a9..24e11f111 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 71d826241..13a5057ed 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index da6529ab9..89dbcb1de 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index 9e7231501..d343434a6 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index f6211af73..c087c4267 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index cb6b75c7d..1d58ff001 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -9,7 +9,7 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" } }, "net451": {} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 0346b2112..04aaa36ff 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index 1d71ceb08..482296f8b 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json index 95471276f..fd503bb1f 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json @@ -7,7 +7,7 @@ "dependencies": { "DependencyContextValidator": "1.0.0-*", "System.Diagnostics.Process": { - "version": "4.1.0-rc3-24209-08", + "version": "4.1.0-rc3-24210-06", "type": "build" } }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 821de92bb..4950df988 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index 6341777d0..a4ac79c65 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json index 87489cbe3..48ba4b49f 100644 --- a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json +++ b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json @@ -2,7 +2,7 @@ "version": "1.0.0", "dependencies": { "TestLibrary": "1.0.0", - "System.IO.Compression": "4.1.0-rc3-24209-08" + "System.IO.Compression": "4.1.0-rc3-24210-06" }, "frameworks": { "net461": {} diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index 20fc90c72..770c7fefc 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index b8f86f1c2..2d9c21710 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index 611b960eb..c8ae8ba48 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 2c76c7add..5a8f429fa 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index e0d1fec5a..eec162232 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index f14599a12..63ec8b322 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index e648bf414..5445a0afe 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index 6af751275..f5874f3a6 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -3,7 +3,7 @@ "outputName": "MyLibrary" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index da6529ab9..89dbcb1de 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index 4b2877f28..5fe005e25 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index 008c431db..520b85de2 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index 8f29a011d..b7b0d3481 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 34de781b6..3e0a9dbb7 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index c22117304..630920451 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,14 +9,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24210-06", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-01" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index bb92373c8..0e7ac97c5 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24210-06", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-01" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index 5316cd29b..16f81f2d2 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index 718b8d97e..f33efd985 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 93352eabf..2ac2e734f 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04" + "NETStandard.Library": "1.6.0-rc3-24210-06", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-01" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index 7be7cc2bb..47c6a1351 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index bcc3cf6b2..01a3ab055 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index 10ca44a36..ab3e5de77 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index d29d48820..318ceae03 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index 718b8d97e..f33efd985 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index 718b8d97e..f33efd985 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index 362f16e1b..c70ff0f61 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index f63a6b162..3c0812b47 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index e09fa40dd..648524f8d 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index 8126141c8..0f7bb7775 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index b7dae4c31..57bbc5d6c 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24209-08", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-06", "xunit": "2.1.0" }, "frameworks": { @@ -15,10 +15,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Linq.Expressions": "4.1.0-rc3-24209-08", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08" + "System.Linq.Expressions": "4.1.0-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06" } }, "net451": {} diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index 1f507e845..bb053b862 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Linq.Expressions": "4.1.0-rc3-24209-08", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Linq.Expressions": "4.1.0-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index 57b0c3919..c1ee3bf94 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json index b9862ca37..1e24d5607 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 8212cf2b5..5c77a7d68 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004443-00", + "version": "1.0.0-rc3-004449-00", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index 1a97c45a9..543997c35 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index c6b29a9e5..a9ce784ba 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index da6529ab9..89dbcb1de 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index da6529ab9..89dbcb1de 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index a1d2cfe62..a768fb6b4 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index 9d091a0ca..58fe5781f 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index 7e6eb6bc2..62856b177 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index bbce94799..4ef38578d 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 31a72f408..e2216c724 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index c6b29a9e5..a9ce784ba 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index be1abb76d..f7f5c620a 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,12 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", - "Microsoft.CSharp": "4.0.1-rc3-24209-08", - "System.Dynamic.Runtime": "4.0.11-rc3-24209-08", - "System.Reflection.Metadata": "1.3.0-rc3-24209-08", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", - "System.Xml.XmlSerializer": "4.0.11-rc3-24209-08", + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", + "Microsoft.CSharp": "4.0.1-rc3-24210-06", + "System.Dynamic.Runtime": "4.0.11-rc3-24210-06", + "System.Reflection.Metadata": "1.3.0-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Xml.XmlSerializer": "4.0.11-rc3-24210-06", "WindowsAzure.Storage": "6.2.2-preview" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index dd8b98e86..15df55085 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index 8019573e1..c9edda9e3 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 3fddd022d..73388fcea 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 3d65d829c..9a09debb8 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json @@ -8,7 +8,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index 24b793632..1bc628451 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json @@ -5,7 +5,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index da6529ab9..89dbcb1de 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 31a72f408..e2216c724 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 65e2da5cf..a35500f2a 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -7,7 +7,7 @@ "net451": {}, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index bf03f49f5..29b70d265 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 2dc50f1ad..14a88876c 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08", + "NETStandard.Library": "1.6.0-rc3-24210-06", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index 3e32e5bb8..c17db1208 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json index a1058d262..a95f50056 100644 --- a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json +++ b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json @@ -5,7 +5,7 @@ }, "packInclude": {}, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index 00f88511e..546750f5c 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json @@ -28,7 +28,7 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json index 0f661e341..db154547e 100644 --- a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json +++ b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json @@ -4,7 +4,7 @@ "xmlDoc": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 4e30414eb..229e25a3c 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,12 +5,12 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" } }, "net451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24209-08" + "Microsoft.CSharp": "4.0.1-rc3-24210-06" } } }, diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index 0991fac94..a58d9091c 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,17 +5,17 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" } }, "netcore50": { "dependencies": { - "System.Private.Uri": "4.0.1-rc3-24209-08" + "System.Private.Uri": "4.0.1-rc3-24210-06" } }, "net99": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24209-08" + "Microsoft.CSharp": "4.0.1-rc3-24210-06" } } }, diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 52b160307..8f8352324 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index c6eca6041..1485d5dcc 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004443-00", + "version": "1.0.0-rc3-004449-00", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index d3742dfeb..757511fed 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index fd56a6bd3..361776a1c 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -3,7 +3,7 @@ "dependencies": { "L12": "1.0.0-*", "L21": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index d12c934ee..546b92d2a 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index b9862ca37..1e24d5607 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index b9862ca37..1e24d5607 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index da6529ab9..89dbcb1de 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index da6529ab9..89dbcb1de 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json index 7e7a67683..25989e9c1 100644 --- a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json +++ b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json @@ -6,7 +6,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08", + "NETStandard.Library": "1.6.0-rc3-24210-06", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 706e937d4..bb0f8b4d5 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index 23e659e68..b4b6e524e 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index 36cfe7cdb..9ca43d5ea 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" } }, "net451": { diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json index ddeee0610..ed26ddd71 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -10,9 +10,9 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08", - "System.Diagnostics.Process": "4.1.0-rc3-24209-08", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06", + "System.Diagnostics.Process": "4.1.0-rc3-24210-06", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index fa3657328..a0e599188 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004443-00"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004443-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004449-00"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004449-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index cf0027e0f..686e0f051 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -5,13 +5,13 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04", - "Microsoft.CSharp": "4.0.1-rc3-24209-08", - "System.Dynamic.Runtime": "4.0.11-rc3-24209-08", - "System.Reflection.Metadata": "1.3.0-rc3-24209-08", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", - "System.Xml.XmlSerializer": "4.0.11-rc3-24209-08", + "NETStandard.Library": "1.6.0-rc3-24210-06", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-01", + "Microsoft.CSharp": "4.0.1-rc3-24210-06", + "System.Dynamic.Runtime": "4.0.11-rc3-24210-06", + "System.Reflection.Metadata": "1.3.0-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Xml.XmlSerializer": "4.0.11-rc3-24210-06", "WindowsAzure.Storage": "6.2.2-preview", "NuGet.CommandLine.XPlat": "3.5.0-beta2-1451", "Microsoft.DotNet.Cli.Build.Framework": { diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 4c88e346f..1986ba37b 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "1.0.2-rc3-24208-04"; - public static readonly string JitVersion = "1.0.2-rc3-24208-04"; + public static readonly string CoreCLRVersion = "1.0.2-rc3-24210-01"; + public static readonly string JitVersion = "1.0.2-rc3-24210-01"; } } diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json index 4ec1546d7..726570ee3 100644 --- a/build_projects/shared-build-targets-utils/project.json +++ b/build_projects/shared-build-targets-utils/project.json @@ -2,12 +2,12 @@ "version": "1.0.0-*", "description": "Build scripts for dotnet-cli", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08", - "Microsoft.CSharp": "4.0.1-rc3-24209-08", - "System.Dynamic.Runtime": "4.0.11-rc3-24209-08", - "System.Reflection.Metadata": "1.3.0-rc3-24209-08", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", - "System.Xml.XmlSerializer": "4.0.11-rc3-24209-08", + "NETStandard.Library": "1.6.0-rc3-24210-06", + "Microsoft.CSharp": "4.0.1-rc3-24210-06", + "System.Dynamic.Runtime": "4.0.11-rc3-24210-06", + "System.Reflection.Metadata": "1.3.0-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Xml.XmlSerializer": "4.0.11-rc3-24210-06", "WindowsAzure.Storage": "6.2.2-preview", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 68da02d29..323828f4c 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -5,10 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08", - "Microsoft.CSharp": "4.0.1-rc3-24209-08", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24208-04", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "NETStandard.Library": "1.6.0-rc3-24210-06", + "Microsoft.CSharp": "4.0.1-rc3-24210-06", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-01", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 456daf003..ec97f914a 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -26,7 +26,7 @@ "portable-net45+wp80+win8+wpa81+dnxcore50" ], "dependencies": { - "System.Diagnostics.Process": "4.1.0-rc3-24209-08" + "System.Diagnostics.Process": "4.1.0-rc3-24210-06" } } } diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 8f1938026..2757790c2 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Linq.Expressions": "4.1.0-rc3-24209-08" + "System.Linq.Expressions": "4.1.0-rc3-24210-06" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index bf0eccd13..e229cd210 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -10,14 +10,14 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.AppContext": "4.1.0-rc3-24209-08", - "System.Collections": "4.0.11-rc3-24209-08", - "System.IO": "4.1.0-rc3-24209-08", - "System.IO.FileSystem": "4.0.1-rc3-24209-08", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24209-08", - "System.Runtime.Extensions": "4.1.0-rc3-24209-08", - "System.Runtime.InteropServices": "4.1.0-rc3-24209-08", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24209-08" + "System.AppContext": "4.1.0-rc3-24210-06", + "System.Collections": "4.0.11-rc3-24210-06", + "System.IO": "4.1.0-rc3-24210-06", + "System.IO.FileSystem": "4.0.1-rc3-24210-06", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-06", + "System.Runtime.Extensions": "4.1.0-rc3-24210-06", + "System.Runtime.InteropServices": "4.1.0-rc3-24210-06", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24210-06" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index d33017d68..5512c57c8 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -7,7 +7,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Runtime.Loader": "4.0.0-rc3-24209-08" + "System.Runtime.Loader": "4.0.0-rc3-24210-06" }, "frameworks": { "netstandard1.6": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 2b2174d60..172393918 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -11,7 +11,7 @@ "Newtonsoft.Json": "9.0.1-beta1", "NuGet.Packaging": "3.5.0-beta2-1451", "NuGet.RuntimeModel": "3.5.0-beta2-1451", - "System.Reflection.Metadata": "1.3.0-rc3-24209-08" + "System.Reflection.Metadata": "1.3.0-rc3-24210-06" }, "frameworks": { "net451": { @@ -33,13 +33,13 @@ "dotnet5.4" ], "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24209-08", - "System.Dynamic.Runtime": "4.0.11-rc3-24209-08", - "System.Runtime.Loader": "4.0.0-rc3-24209-08", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", - "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24209-08", - "System.Threading.Thread": "4.0.0-rc3-24209-08", - "System.Xml.XDocument": "4.0.11-rc3-24209-08" + "Microsoft.CSharp": "4.0.1-rc3-24210-06", + "System.Dynamic.Runtime": "4.0.11-rc3-24210-06", + "System.Runtime.Loader": "4.0.0-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24210-06", + "System.Threading.Thread": "4.0.0-rc3-24210-06", + "System.Xml.XDocument": "4.0.11-rc3-24210-06" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 215049fb2..86f7145a4 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -16,9 +16,9 @@ "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { - "System.Diagnostics.Debug": "4.0.11-rc3-24209-08", - "System.Dynamic.Runtime": "4.0.11-rc3-24209-08", - "System.Linq": "4.1.0-rc3-24209-08" + "System.Diagnostics.Debug": "4.0.11-rc3-24210-06", + "System.Dynamic.Runtime": "4.0.11-rc3-24210-06", + "System.Linq": "4.1.0-rc3-24210-06" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 928bcb9a6..585ecc0a0 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -22,8 +22,8 @@ "portable-net45+win8" ], "dependencies": { - "System.Resources.ResourceManager": "4.0.1-rc3-24209-08", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24209-08" + "System.Resources.ResourceManager": "4.0.1-rc3-24210-06", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-06" } } }, diff --git a/src/compilers/project.json b/src/compilers/project.json index 0aa3a493f..4bc7a14a5 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160608-03", "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160608-03", diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 141b5d8a8..03ca1c2ca 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index 3a381ef50..9ed06c96b 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template index 223cd7bbe..203692e21 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, @@ -14,7 +14,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } }, "imports": [ diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index dbb08841c..9ee592f3b 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 5998d69e1..f26ab9470 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -28,8 +28,8 @@ }, "NuGet.CommandLine.XPlat": "3.5.0-beta2-1451", "Newtonsoft.Json": "9.0.1-beta1", - "System.Text.Encoding.CodePages": "4.0.1-rc3-24209-08", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24209-08", + "System.Text.Encoding.CodePages": "4.0.1-rc3-24210-06", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24210-06", "Microsoft.ApplicationInsights": "2.0.0", "Microsoft.DotNet.ProjectModel": { "target": "project" @@ -45,16 +45,16 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24209-08", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24209-08", - "System.Resources.Writer": "4.0.0-rc3-24209-08", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", - "System.Private.DataContractSerialization": "4.1.1-rc3-24209-08", - "System.Text.RegularExpressions": "4.1.0-rc3-24209-08", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-06", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24210-06", + "System.Resources.Writer": "4.0.0-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Private.DataContractSerialization": "4.1.1-rc3-24210-06", + "System.Text.RegularExpressions": "4.1.0-rc3-24210-06", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24209-08", + "version": "4.0.0-rc3-24210-06", "exclude": "compile" } }, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index a62144c92..21af0b55a 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index a6cae437e..9e1060c77 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 9000dd3c5..a1cc06298 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index 251fe14bf..aeb1b761f 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 27f13d7ff..13439de22 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,10 +16,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24209-08", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "NuGet.Versioning": "3.5.0-beta2-1451", "NuGet.Packaging": "3.5.0-beta2-1451", "NuGet.Frameworks": "3.5.0-beta2-1451", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 61b27061e..78adce5ae 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json index 1975808cd..cea676326 100644 --- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.DotNet.ProjectModel.Loader": { "target": "project" diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 5c3c57bd0..216230b2e 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,9 +11,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 7d569641d..d3537b7bd 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,9 +7,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24209-08", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-06", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Performance/project.json b/test/Performance/project.json index 2a9148217..6c36ed97c 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 0eaabc63e..eabf2caa5 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index 725eaff9e..767090184 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,12 +3,12 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index b566825b4..ce3ce2546 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,13 +3,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", - "System.Diagnostics.Process": "4.1.0-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Diagnostics.Process": "4.1.0-rc3-24210-06", "TestAppWithPortablePdbs": { "target": "project" }, diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index f5b521b20..51664bea5 100644 --- a/test/TestingAbstractions/TestAppWithFullPdbs/project.json +++ b/test/TestingAbstractions/TestAppWithFullPdbs/project.json @@ -4,7 +4,7 @@ "debugType": "full" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": {} diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index 940e0e499..4837b472e 100644 --- a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json +++ b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24209-08" + "NETStandard.Library": "1.6.0-rc3-24210-06" }, "frameworks": { "netstandard1.5": {} diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json index 79b57da33..b5e5422c5 100644 --- a/test/binding-redirects.Tests/project.json +++ b/test/binding-redirects.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24209-08", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-06", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" } diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index b52d0316e..c63d0e2ee 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 992dac993..e43fd1dee 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index 11f35dbd5..5b033e384 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index b47ade012..638fc76a3 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index e6655bcf4..43315b68a 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -23,7 +23,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24209-08", + "version": "4.0.0-rc3-24210-06", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index ce735426f..d639ce999 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 83bad7bd7..b8ee21d14 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", - "System.IO.Compression.ZipFile": "4.0.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.IO.Compression.ZipFile": "4.0.1-rc3-24210-06", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 39feebcbc..93f1cdf7a 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,13 +2,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24209-08", + "version": "4.0.0-rc3-24210-06", "exclude": "Compile" }, "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -19,7 +19,7 @@ }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Net.NameResolution": "4.0.0-rc3-24209-08" + "System.Net.NameResolution": "4.0.0-rc3-24210-06" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index db733f349..8a605e22d 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.TestFramework": { "target": "project" }, @@ -15,7 +15,7 @@ "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00206", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24209-08" + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24210-06" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index b0354eeea..3a3b9d9da 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 251fe14bf..aeb1b761f 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index da956cad8..b3cd1ed31 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index db95fa520..52a2a3926 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Newtonsoft.Json": "9.0.1-beta1", "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -15,9 +15,9 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc3-24209-08", - "System.Net.Sockets": "4.1.0-rc3-24209-08", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Net.NameResolution": "4.0.0-rc3-24210-06", + "System.Net.Sockets": "4.1.0-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 096e2093c..3d7f8ccd3 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,14 +3,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, "Newtonsoft.Json": "9.0.1-beta1", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24209-08", + "version": "4.0.0-rc3-24210-06", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 1c6a51c1b..a060f5ebd 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004443-00" + "version": "1.0.0-rc3-004449-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24209-08", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index ab629300d..a3519ed06 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004443-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From 4293d05571af3f39684c3d17185d72c5ea4329dd Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 10 Jun 2016 17:50:01 -0500 Subject: [PATCH 39/97] Porting @svick's fix to change a hard-coded URL to a redirect link. --- src/dotnet/commands/dotnet-build/IncrementalPreconditions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet/commands/dotnet-build/IncrementalPreconditions.cs b/src/dotnet/commands/dotnet-build/IncrementalPreconditions.cs index 2677c0919..ffb57306e 100644 --- a/src/dotnet/commands/dotnet-build/IncrementalPreconditions.cs +++ b/src/dotnet/commands/dotnet-build/IncrementalPreconditions.cs @@ -64,7 +64,7 @@ namespace Microsoft.DotNet.Tools.Build log.Append( "Incremental compilation will be automatically enabled if the above mentioned project properties are not used. " + "For more information on the properties and how to address them, please consult:\n" + - @"https://github.com/dotnet/cli/blob/master/Documentation/addressing-incremental-compilation-warnings.md"); + @"https://aka.ms/dotnet-build"); log.AppendLine(); log.AppendLine(); From 19c905d223a38f67b1d1e2f5aacc7c8033a6c709 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Fri, 10 Jun 2016 16:37:09 -0700 Subject: [PATCH 40/97] fix reg key in cli msi --- packaging/windows/clisdk/provider.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/windows/clisdk/provider.wxs b/packaging/windows/clisdk/provider.wxs index 35d397eca..e1711ec76 100644 --- a/packaging/windows/clisdk/provider.wxs +++ b/packaging/windows/clisdk/provider.wxs @@ -2,7 +2,7 @@ - + From 84f63029feb8e31501f001377b203b6af79da00c Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 3 Jun 2016 17:36:40 -0700 Subject: [PATCH 41/97] Almost all of the code to prime the NuGet cache from the archive. - Created a Configurer class that is responsible for deciding when to run the dotnet first time use experience and invoke the NuGetCachePrimer. - Added the NuGetCachePrimer which extract the archive and primes the cache. -- This is just missing creating the sentinel once restore succeeds. - Added a shell for the NugetPackagesArchiver, which will be responsible for expanding the archive (likely replaced in the future by an abstraction from Eric's code or its implementation will simply call Eric's code). - Added a TemporaryFolder abstration to Internal Abstractions that handles deleting the temporary folder once we are done with it. --- Microsoft.DotNet.Cli.sln | 38 ++++ .../dotnet-cli-build/TestTargets.cs | 1 + .../DotnetFirstTimeUseConfigurer.cs | 49 +++++ .../INuGetCachePrimer.cs | 10 ++ .../INuGetCacheResolver.cs | 10 ++ .../INuGetPackagesArchiver.cs | 10 ++ .../Microsoft.DotNet.Configurer.xproj | 19 ++ .../NuGetCachePrimer.cs | 92 ++++++++++ .../NuGetCacheResolver.cs | 15 ++ .../NuGetPackagesArchiver.cs | 20 +++ .../Properties/Properties.cs | 3 + src/Microsoft.DotNet.Configurer/project.json | 34 ++++ .../DirectoryWrapper.cs | 6 + .../IDirectory.cs | 2 + .../ITemporaryDirectory.cs | 12 ++ .../Properties/Properties.cs | 5 +- .../TemporaryDirectory.cs | 31 ++++ src/dotnet/project.json | 3 + .../GivenADotnetFirstTimeUseConfigurer.cs | 69 +++++++ .../GivenANuGetCachePrimer.cs | 170 ++++++++++++++++++ ...icrosoft.DotNet.Configurer.UnitTests.xproj | 18 ++ .../project.json | 35 ++++ .../Mock/FileSystemMockBuilder.cs | 37 +++- .../Mock/ITemporaryDirectoryMock.cs | 12 ++ .../Properties/Properties.cs | 3 +- 25 files changed, 698 insertions(+), 6 deletions(-) create mode 100644 src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs create mode 100644 src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs create mode 100644 src/Microsoft.DotNet.Configurer/INuGetCacheResolver.cs create mode 100644 src/Microsoft.DotNet.Configurer/INuGetPackagesArchiver.cs create mode 100644 src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.xproj create mode 100644 src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs create mode 100644 src/Microsoft.DotNet.Configurer/NuGetCacheResolver.cs create mode 100644 src/Microsoft.DotNet.Configurer/NuGetPackagesArchiver.cs create mode 100644 src/Microsoft.DotNet.Configurer/Properties/Properties.cs create mode 100644 src/Microsoft.DotNet.Configurer/project.json create mode 100644 src/Microsoft.DotNet.InternalAbstractions/ITemporaryDirectory.cs create mode 100644 src/Microsoft.DotNet.InternalAbstractions/TemporaryDirectory.cs create mode 100644 test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs create mode 100644 test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs create mode 100644 test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.xproj create mode 100644 test/Microsoft.DotNet.Configurer.UnitTests/project.json create mode 100644 test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/ITemporaryDirectoryMock.cs diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index e988fae47..825c565be 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -115,6 +115,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectMod EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel.Loader.Tests", "test\Microsoft.DotNet.ProjectModel.Loader.Tests\Microsoft.DotNet.ProjectModel.Loader.Tests.xproj", "{5DF6C9DA-6909-4EC0-909E-6913580BB4A4}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Configurer", "src\Microsoft.DotNet.Configurer\Microsoft.DotNet.Configurer.xproj", "{E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Configurer.UnitTests", "test\Microsoft.DotNet.Configurer.UnitTests\Microsoft.DotNet.Configurer.UnitTests.xproj", "{4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -847,6 +851,38 @@ Global {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {5DF6C9DA-6909-4EC0-909E-6913580BB4A4}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.Debug|x64.ActiveCfg = Debug|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.Debug|x64.Build.0 = Debug|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.Release|Any CPU.Build.0 = Release|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.Release|x64.ActiveCfg = Release|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.Release|x64.Build.0 = Release|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.Debug|x64.ActiveCfg = Debug|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.Debug|x64.Build.0 = Debug|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.Release|Any CPU.Build.0 = Release|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.Release|x64.ActiveCfg = Release|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.Release|x64.Build.0 = Release|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.RelWithDebInfo|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -902,5 +938,7 @@ Global {1DBB7542-0345-4F4B-A84B-3B00B185D416} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3} {1C599FFD-FB52-4279-A8E5-465D3EC499E1} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {5DF6C9DA-6909-4EC0-909E-6913580BB4A4} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} + {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} EndGlobalSection EndGlobal diff --git a/build_projects/dotnet-cli-build/TestTargets.cs b/build_projects/dotnet-cli-build/TestTargets.cs index 4cbfe8239..f2eaf828f 100644 --- a/build_projects/dotnet-cli-build/TestTargets.cs +++ b/build_projects/dotnet-cli-build/TestTargets.cs @@ -40,6 +40,7 @@ namespace Microsoft.DotNet.Cli.Build "Microsoft.DotNet.Compiler.Common.Tests", "Microsoft.DotNet.ProjectModel.Tests", "Microsoft.Extensions.DependencyModel.Tests", + "Microsoft.DotNet.Configurer.UnitTests", "Performance" }; diff --git a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs new file mode 100644 index 000000000..d8fdd4cbd --- /dev/null +++ b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs @@ -0,0 +1,49 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.IO; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.Extensions.EnvironmentAbstractions; + +namespace Microsoft.DotNet.Configurer +{ + public class DotnetFirstTimeUseConfigurer + { + public static readonly string SENTINEL = $"{Product.Version}.dotnetSentinel"; + + private IFile _file; + private INuGetCachePrimer _nugetCachePrimer; + private INuGetCacheResolver _nugetCacheResolver; + + public DotnetFirstTimeUseConfigurer(INuGetCachePrimer nugetCachePrimer, INuGetCacheResolver nugetCacheResolver) + : this(nugetCachePrimer, nugetCacheResolver, FileSystemWrapper.Default.File) + { + } + + internal DotnetFirstTimeUseConfigurer( + INuGetCachePrimer nugetCachePrimer, + INuGetCacheResolver nugetCacheResolver, + IFile file) + { + _file = file; + _nugetCachePrimer = nugetCachePrimer; + _nugetCacheResolver = nugetCacheResolver; + } + + public void Configure() + { + if(ShouldPrimeNugetCache()) + { + _nugetCachePrimer.PrimeCache(); + } + } + + private bool ShouldPrimeNugetCache() + { + var nugetCachePath = _nugetCacheResolver.ResolveNugetCachePath(); + var sentinel = Path.Combine(nugetCachePath, SENTINEL); + + return !_file.Exists(sentinel); + } + } +} diff --git a/src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs new file mode 100644 index 000000000..321e6fe8b --- /dev/null +++ b/src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs @@ -0,0 +1,10 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +namespace Microsoft.DotNet.Configurer +{ + public interface INuGetCachePrimer + { + void PrimeCache(); + } +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/INuGetCacheResolver.cs b/src/Microsoft.DotNet.Configurer/INuGetCacheResolver.cs new file mode 100644 index 000000000..715762479 --- /dev/null +++ b/src/Microsoft.DotNet.Configurer/INuGetCacheResolver.cs @@ -0,0 +1,10 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +namespace Microsoft.DotNet.Configurer +{ + public interface INuGetCacheResolver + { + string ResolveNugetCachePath(); + } +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/INuGetPackagesArchiver.cs b/src/Microsoft.DotNet.Configurer/INuGetPackagesArchiver.cs new file mode 100644 index 000000000..dfe784d60 --- /dev/null +++ b/src/Microsoft.DotNet.Configurer/INuGetPackagesArchiver.cs @@ -0,0 +1,10 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +namespace Microsoft.DotNet.Configurer +{ + public interface INuGetPackagesArchiver + { + string ExtractArchive(); + } +} diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.xproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.xproj new file mode 100644 index 000000000..f533d0dad --- /dev/null +++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.xproj @@ -0,0 +1,19 @@ + + + + 14.0.25123 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + e5ed47ef-bf25-4da9-a7fe-290c642cbf0f + Microsoft.DotNet.Configurer + .\obj + .\bin\ + + + + 2.0 + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs new file mode 100644 index 000000000..9f41fc652 --- /dev/null +++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs @@ -0,0 +1,92 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Collections.Generic; +using System.Linq; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.Extensions.EnvironmentAbstractions; + +namespace Microsoft.DotNet.Configurer +{ + public class NuGetCachePrimer : INuGetCachePrimer + { + private const string NUGET_SOURCE_PARAMETER = "-s"; + private readonly ICommandFactory _commandFactory; + private readonly IDirectory _directory; + private readonly INuGetPackagesArchiver _nugetPackagesArchiver; + + public NuGetCachePrimer(ICommandFactory commandFactory, INuGetPackagesArchiver nugetPackagesArchiver) + : this(commandFactory, nugetPackagesArchiver, FileSystemWrapper.Default.Directory) + { + } + + internal NuGetCachePrimer( + ICommandFactory commandFactory, + INuGetPackagesArchiver nugetPackagesArchiver, + IDirectory directory) + { + _commandFactory = commandFactory; + _directory = directory; + _nugetPackagesArchiver = nugetPackagesArchiver; + } + + public void PrimeCache() + { + var pathToPackagesArchive = _nugetPackagesArchiver.ExtractArchive(); + + PrimeCacheUsingArchive(pathToPackagesArchive); + } + + private void PrimeCacheUsingArchive(string pathToPackagesArchive) + { + using (var temporaryDotnetNewDirectory = _directory.CreateTemporaryDirectory()) + { + var workingDirectory = temporaryDotnetNewDirectory.DirectoryPath; + var dotnetNewSucceeded = CreateTemporaryProject(workingDirectory); + + if (dotnetNewSucceeded) + { + RestoreTemporaryProject(pathToPackagesArchive, workingDirectory); + } + } + // -- PrimeCache() + // (done) Create temporary project under a temporary folder using dotnet new + // (done) Restore that project using dotnet restore -s parameter pointing to the + // Create sentinel + // (done) Delete temporary folder (should be done automatically if using abstraction). + } + + private bool CreateTemporaryProject(string workingDirectory) + { + return RunCommand("dotnet new", Enumerable.Empty(), workingDirectory); + } + + private bool RestoreTemporaryProject(string pathToPackagesArchive, string workingDirectory) + { + return RunCommand( + "dotnet restore", + new[] {NUGET_SOURCE_PARAMETER, $"{pathToPackagesArchive}"}, + workingDirectory); + } + + private bool RunCommand(string commandToExecute, IEnumerable args, string workingDirectory) + { + var command = _commandFactory + .Create(commandToExecute, args) + .WorkingDirectory(workingDirectory) + .CaptureStdOut() + .CaptureStdErr(); + + var commandResult = command.Execute(); + + if (commandResult.ExitCode != 0) + { + Reporter.Verbose.WriteLine(commandResult.StdErr); + Reporter.Error.WriteLine( + $"Failed to create prime the NuGet cache. {commandToExecute} failed with: {commandResult.ExitCode}"); + } + + return commandResult.ExitCode == 0; + } + } +} diff --git a/src/Microsoft.DotNet.Configurer/NuGetCacheResolver.cs b/src/Microsoft.DotNet.Configurer/NuGetCacheResolver.cs new file mode 100644 index 000000000..2a31e5d45 --- /dev/null +++ b/src/Microsoft.DotNet.Configurer/NuGetCacheResolver.cs @@ -0,0 +1,15 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using Microsoft.DotNet.ProjectModel.Resolution; + +namespace Microsoft.DotNet.Configurer +{ + public class NuGetCacheResolver : INuGetCacheResolver + { + public string ResolveNugetCachePath() + { + return PackageDependencyProvider.ResolvePackagesPath(null, null); + } + } +} diff --git a/src/Microsoft.DotNet.Configurer/NuGetPackagesArchiver.cs b/src/Microsoft.DotNet.Configurer/NuGetPackagesArchiver.cs new file mode 100644 index 000000000..3c171fd15 --- /dev/null +++ b/src/Microsoft.DotNet.Configurer/NuGetPackagesArchiver.cs @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +namespace Microsoft.DotNet.Configurer +{ + public class NuGetPackagesArchiver : INuGetPackagesArchiver + { + public string ExtractArchive() + { + // -- ExtractArchive + // find archive + // extract archive to temporary folder + // Path.GetTempPath(); + // Path.GetRandomFileName(); + // Consider putting this inside an abstraction that will delete the folder automatically once it is done. + + return @"C:\Users\licavalc\git\temp\feed"; + } + } +} diff --git a/src/Microsoft.DotNet.Configurer/Properties/Properties.cs b/src/Microsoft.DotNet.Configurer/Properties/Properties.cs new file mode 100644 index 000000000..a568b652e --- /dev/null +++ b/src/Microsoft.DotNet.Configurer/Properties/Properties.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/project.json b/src/Microsoft.DotNet.Configurer/project.json new file mode 100644 index 000000000..8e7ad4709 --- /dev/null +++ b/src/Microsoft.DotNet.Configurer/project.json @@ -0,0 +1,34 @@ +{ + "version": "1.0.0-rc3-*", + "buildOptions": { + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk", + }, + "dependencies": { + "Microsoft.DotNet.InternalAbstractions": { + "target": "project" + }, + "Microsoft.DotNet.Cli.Utils": { + "target": "project" + }, + "Microsoft.DotNet.ProjectModel": { + "target": "project" + } + }, + "frameworks": { + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "netstandardapp1.5", + "portable-net45+win8", + "portable-net45+wp80+win8+wpa81+dnxcore50" + ] + } + }, + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/dotnet/cli" + } + } +} diff --git a/src/Microsoft.DotNet.InternalAbstractions/DirectoryWrapper.cs b/src/Microsoft.DotNet.InternalAbstractions/DirectoryWrapper.cs index 3aa9b5174..a86187822 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/DirectoryWrapper.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/DirectoryWrapper.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.IO; +using Microsoft.DotNet.InternalAbstractions; namespace Microsoft.Extensions.EnvironmentAbstractions { @@ -11,5 +12,10 @@ namespace Microsoft.Extensions.EnvironmentAbstractions { return Directory.Exists(path); } + + public ITemporaryDirectory CreateTemporaryDirectory() + { + return new TemporaryDirectory(); + } } } \ No newline at end of file diff --git a/src/Microsoft.DotNet.InternalAbstractions/IDirectory.cs b/src/Microsoft.DotNet.InternalAbstractions/IDirectory.cs index 20f28a9c5..0fed21865 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/IDirectory.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/IDirectory.cs @@ -6,5 +6,7 @@ namespace Microsoft.Extensions.EnvironmentAbstractions internal interface IDirectory { bool Exists(string path); + + ITemporaryDirectory CreateTemporaryDirectory(); } } \ No newline at end of file diff --git a/src/Microsoft.DotNet.InternalAbstractions/ITemporaryDirectory.cs b/src/Microsoft.DotNet.InternalAbstractions/ITemporaryDirectory.cs new file mode 100644 index 000000000..1c9bd4b75 --- /dev/null +++ b/src/Microsoft.DotNet.InternalAbstractions/ITemporaryDirectory.cs @@ -0,0 +1,12 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; + +namespace Microsoft.Extensions.EnvironmentAbstractions +{ + internal interface ITemporaryDirectory : IDisposable + { + string DirectoryPath { get; } + } +} diff --git a/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs b/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs index f8989eabc..b88d8953c 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs @@ -2,4 +2,7 @@ [assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.DotNet.Tools.Tests.Utilities, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file +[assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] \ No newline at end of file diff --git a/src/Microsoft.DotNet.InternalAbstractions/TemporaryDirectory.cs b/src/Microsoft.DotNet.InternalAbstractions/TemporaryDirectory.cs new file mode 100644 index 000000000..d43683e15 --- /dev/null +++ b/src/Microsoft.DotNet.InternalAbstractions/TemporaryDirectory.cs @@ -0,0 +1,31 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using Microsoft.Extensions.EnvironmentAbstractions; +using System.IO; + +namespace Microsoft.DotNet.InternalAbstractions +{ + internal class TemporaryDirectory : ITemporaryDirectory + { + public string DirectoryPath { get; } + + public TemporaryDirectory() + { + DirectoryPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); + Directory.CreateDirectory(DirectoryPath); + } + + public void Dispose() + { + try + { + Directory.Delete(DirectoryPath, true); + } + catch + { + // Ignore failures here. + } + } + } +} diff --git a/src/dotnet/project.json b/src/dotnet/project.json index f26ab9470..81789c508 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -43,6 +43,9 @@ "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, + "Microsoft.DotNet.Configurer": { + "target": "project" + }, "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc3-004449-00" diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs new file mode 100644 index 000000000..46f36f53d --- /dev/null +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs @@ -0,0 +1,69 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using FluentAssertions; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Configurer; +using Microsoft.DotNet.Tools.Test; +using Microsoft.Extensions.DependencyModel.Tests; +using Microsoft.Extensions.EnvironmentAbstractions; +using Moq; +using Xunit; + +namespace Microsoft.DotNet.Configurer.UnitTests +{ + public class GivenADotnetFirstTimeUseConfigurer + { + private const string NUGET_CACHE_PATH = "some path"; + + private Mock _nugetCachePrimerMock; + private Mock _nugetCacheResolverMock; + + public GivenADotnetFirstTimeUseConfigurer() + { + _nugetCachePrimerMock = new Mock(); + _nugetCacheResolverMock = new Mock(); + _nugetCacheResolverMock.Setup(n => n.ResolveNugetCachePath()).Returns(NUGET_CACHE_PATH); + } + + [Fact] + public void The_sentinel_has_the_current_version_in_its_name() + { + DotnetFirstTimeUseConfigurer.SENTINEL.Should().Contain($"{Product.Version}"); + } + + [Fact] + public void It_does_not_prime_the_cache_if_the_sentinel_exists() + { + var fileSystemMockBuilder = FileSystemMockBuilder.Create(); + fileSystemMockBuilder.AddFiles(NUGET_CACHE_PATH, DotnetFirstTimeUseConfigurer.SENTINEL); + + var fileSystemMock = fileSystemMockBuilder.Build(); + + var dotnetFirstTimeUseConfigurer = new DotnetFirstTimeUseConfigurer( + _nugetCachePrimerMock.Object, + _nugetCacheResolverMock.Object, + fileSystemMock.File); + + dotnetFirstTimeUseConfigurer.Configure(); + + _nugetCachePrimerMock.Verify(r => r.PrimeCache(), Times.Never); + } + + [Fact] + public void It_primes_the_cache_if_the_sentinel_does_not_exist() + { + var fileSystemMockBuilder = FileSystemMockBuilder.Create(); + var fileSystemMock = fileSystemMockBuilder.Build(); + + var dotnetFirstTimeUseConfigurer = new DotnetFirstTimeUseConfigurer( + _nugetCachePrimerMock.Object, + _nugetCacheResolverMock.Object, + fileSystemMock.File); + + dotnetFirstTimeUseConfigurer.Configure(); + + _nugetCachePrimerMock.Verify(r => r.PrimeCache(), Times.Once); + } + } +} diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs new file mode 100644 index 000000000..24ba95d99 --- /dev/null +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs @@ -0,0 +1,170 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Collections.Generic; +using System.Linq; +using FluentAssertions; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Tools.Test.Utilities.Mock; +using Microsoft.Extensions.DependencyModel.Tests; +using Microsoft.Extensions.EnvironmentAbstractions; +using Moq; +using NuGet.Frameworks; +using Xunit; + +namespace Microsoft.DotNet.Configurer.UnitTests +{ + public class GivenANuGetCachePrimer + { + private const string TEMPORARY_FOLDER_PATH = "some path"; + private const string PACKAGES_ARCHIVE_PATH = "some other path"; + + private IFileSystem _fileSystemMock; + private ITemporaryDirectoryMock _temporaryDirectoryMock; + + private Mock _commandFactoryMock; + private Mock _dotnetNewCommandMock; + private Mock _dotnetRestoreCommandMock; + private Mock _nugetPackagesArchiverMock; + + public GivenANuGetCachePrimer() + { + var fileSystemMockBuilder = FileSystemMockBuilder.Create(); + fileSystemMockBuilder.TemporaryFolder = TEMPORARY_FOLDER_PATH; + _fileSystemMock = fileSystemMockBuilder.Build(); + _temporaryDirectoryMock = (ITemporaryDirectoryMock)_fileSystemMock.Directory.CreateTemporaryDirectory(); + + _commandFactoryMock = SetupCommandFactoryMock(); + + _nugetPackagesArchiverMock = new Mock(); + _nugetPackagesArchiverMock.Setup(n => n.ExtractArchive()).Returns(PACKAGES_ARCHIVE_PATH); + + var nugetCachePrimer = new NuGetCachePrimer( + _commandFactoryMock.Object, + _nugetPackagesArchiverMock.Object, + _fileSystemMock.Directory); + + nugetCachePrimer.PrimeCache(); + } + + private Mock SetupCommandFactoryMock() + { + var commandFactoryMock = new Mock(); + + _dotnetNewCommandMock = new Mock(); + SetupCommandMock(_dotnetNewCommandMock); + commandFactoryMock + .Setup(c => c.Create("dotnet new", Enumerable.Empty(), null, Constants.DefaultConfiguration)) + .Returns(_dotnetNewCommandMock.Object); + + _dotnetRestoreCommandMock = new Mock(); + SetupCommandMock(_dotnetRestoreCommandMock); + commandFactoryMock + .Setup(c => c.Create( + "dotnet restore", + It.IsAny>(), + null, + Constants.DefaultConfiguration)) + .Returns(_dotnetRestoreCommandMock.Object); + + return commandFactoryMock; + } + + private void SetupCommandMock(Mock commandMock) + { + commandMock + .Setup(c => c.WorkingDirectory(TEMPORARY_FOLDER_PATH)) + .Returns(commandMock.Object); + commandMock.Setup(c => c.CaptureStdOut()).Returns(commandMock.Object); + commandMock.Setup(c => c.CaptureStdErr()).Returns(commandMock.Object); + } + + [Fact] + public void It_disposes_the_temporary_directory_created_for_the_temporary_project_used_to_prime_the_cache() + { + _temporaryDirectoryMock.DisposedTemporaryDirectory.Should().BeTrue(); + } + + [Fact] + public void It_runs_dotnet_new_using_the_temporary_folder() + { + _dotnetNewCommandMock.Verify(c => c.WorkingDirectory(TEMPORARY_FOLDER_PATH), Times.Once); + } + + [Fact] + public void It_runs_dotnet_new_capturing_stdout() + { + _dotnetNewCommandMock.Verify(c => c.CaptureStdOut(), Times.Once); + } + + [Fact] + public void It_runs_dotnet_new_capturing_stderr() + { + _dotnetNewCommandMock.Verify(c => c.CaptureStdErr(), Times.Once); + } + + [Fact] + public void It_actually_runs_dotnet_new() + { + _dotnetNewCommandMock.Verify(c => c.Execute(), Times.Once); + } + + [Fact] + public void It_uses_the_packages_archive_with_dotnet_restore() + { + _commandFactoryMock.Verify( + c => c.Create( + "dotnet restore", + new [] {"-s", $"{PACKAGES_ARCHIVE_PATH}"}, + null, + Constants.DefaultConfiguration), + Times.Once); + } + + [Fact] + public void It_does_not_run_restore_if_dotnet_new_fails() + { + var commandFactoryMock = SetupCommandFactoryMock();; + _dotnetNewCommandMock.Setup(c => c.Execute()).Returns(new CommandResult(null, -1, null, null)); + + var nugetCachePrimer = new NuGetCachePrimer( + commandFactoryMock.Object, + _nugetPackagesArchiverMock.Object, + _fileSystemMock.Directory); + + nugetCachePrimer.PrimeCache(); + + commandFactoryMock.Verify( + c => c.Create( + "dotnet restore", + It.IsAny>(), + It.IsAny(), + It.IsAny()), + Times.Never); + } + + [Fact] + public void It_runs_dotnet_restore_using_the_temporary_folder() + { + _dotnetRestoreCommandMock.Verify(c => c.WorkingDirectory(TEMPORARY_FOLDER_PATH), Times.Once); + } + + [Fact] + public void It_runs_dotnet_restore_capturing_stdout() + { + _dotnetRestoreCommandMock.Verify(c => c.CaptureStdOut(), Times.Once); + } + + [Fact] + public void It_runs_dotnet_restore_capturing_stderr() + { + _dotnetRestoreCommandMock.Verify(c => c.CaptureStdErr(), Times.Once); + } + + [Fact] + public void It_actually_runs_dotnet_restore() + { + _dotnetRestoreCommandMock.Verify(c => c.Execute(), Times.Once); + } + } +} diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.xproj b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.xproj new file mode 100644 index 000000000..5616a9a19 --- /dev/null +++ b/test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.xproj @@ -0,0 +1,18 @@ + + + + 14.0.23107 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 4c3b06d5-b6d5-4e5b-a44f-3ebe52a1c759 + Microsoft.DotNet.Configurer.UnitTests + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin + + + 2.0 + + + \ No newline at end of file diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/project.json b/test/Microsoft.DotNet.Configurer.UnitTests/project.json new file mode 100644 index 000000000..d876769f2 --- /dev/null +++ b/test/Microsoft.DotNet.Configurer.UnitTests/project.json @@ -0,0 +1,35 @@ +{ + "version": "1.0.0-*", + "buildOptions": { + "keyFile": "../../tools/Key.snk" + }, + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004363" + }, + "System.Diagnostics.TraceSource": "4.0.0-rc3-24131-00", + "Microsoft.DotNet.Configurer": { + "target": "project" + }, + "Microsoft.DotNet.Tools.Tests.Utilities": { + "target": "project" + }, + "Microsoft.DotNet.Cli.Utils": { + "target": "project" + }, + "FluentAssertions": "4.0.0", + "moq.netcore": "4.4.0-beta8", + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-rc2-192208-24" + }, + "frameworks": { + "netcoreapp1.0": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] + } + }, + "testRunner": "xunit" +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs index b5bfd5a56..b71485214 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs @@ -1,10 +1,12 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; +using Microsoft.DotNet.Tools.Test.Utilities.Mock; using Microsoft.Extensions.EnvironmentAbstractions; namespace Microsoft.Extensions.DependencyModel.Tests @@ -13,6 +15,8 @@ namespace Microsoft.Extensions.DependencyModel.Tests { private Dictionary _files = new Dictionary(); + public string TemporaryFolder { get; set; } + internal static IFileSystem Empty { get; } = Create().Build(); public static FileSystemMockBuilder Create() @@ -37,15 +41,15 @@ namespace Microsoft.Extensions.DependencyModel.Tests internal IFileSystem Build() { - return new FileSystemMock(_files); + return new FileSystemMock(_files, TemporaryFolder); } private class FileSystemMock : IFileSystem { - public FileSystemMock(Dictionary files) + public FileSystemMock(Dictionary files, string temporaryFolder) { File = new FileMock(files); - Directory = new DirectoryMock(files); + Directory = new DirectoryMock(files, temporaryFolder); } public IFile File { get; } @@ -85,9 +89,17 @@ namespace Microsoft.Extensions.DependencyModel.Tests private class DirectoryMock : IDirectory { private Dictionary _files; - public DirectoryMock(Dictionary files) + private readonly TemporaryDirectoryMock _temporaryDirectory; + + public DirectoryMock(Dictionary files, string temporaryDirectory) { _files = files; + _temporaryDirectory = new TemporaryDirectoryMock(temporaryDirectory); + } + + public ITemporaryDirectory CreateTemporaryDirectory() + { + return _temporaryDirectory; } public bool Exists(string path) @@ -95,6 +107,23 @@ namespace Microsoft.Extensions.DependencyModel.Tests return _files.Keys.Any(k => k.StartsWith(path)); } } + + private class TemporaryDirectoryMock : ITemporaryDirectoryMock + { + public bool DisposedTemporaryDirectory { get; private set; } + + public TemporaryDirectoryMock(string temporaryDirectory) + { + DirectoryPath = temporaryDirectory; + } + + public string DirectoryPath { get; } + + public void Dispose() + { + DisposedTemporaryDirectory = true; + } + } } } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/ITemporaryDirectoryMock.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/ITemporaryDirectoryMock.cs new file mode 100644 index 000000000..ab09a47fa --- /dev/null +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/ITemporaryDirectoryMock.cs @@ -0,0 +1,12 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using Microsoft.Extensions.EnvironmentAbstractions; + +namespace Microsoft.DotNet.Tools.Test.Utilities.Mock +{ + internal interface ITemporaryDirectoryMock : ITemporaryDirectory + { + bool DisposedTemporaryDirectory { get; } + } +} diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Properties/Properties.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Properties/Properties.cs index 50d5790b3..88c50a9b3 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Properties/Properties.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Properties/Properties.cs @@ -1,3 +1,4 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel.Tests , PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file +[assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel.Tests , PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer.UnitTests , PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file From 32962a14e26b88908cf163a7c71606782eae9d07 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Tue, 31 May 2016 21:19:26 -0700 Subject: [PATCH 42/97] move all version suffixes to preview3 and rc4 --- branchinfo.txt | 2 +- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- src/Microsoft.DotNet.Compiler.Common/project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- src/Microsoft.DotNet.InternalAbstractions/project.json | 2 +- src/Microsoft.DotNet.ProjectModel.Loader/project.json | 2 +- src/Microsoft.DotNet.ProjectModel.Workspaces/project.json | 2 +- src/Microsoft.DotNet.ProjectModel/project.json | 2 +- src/Microsoft.DotNet.TestFramework/project.json | 2 +- src/Microsoft.Extensions.DependencyModel/project.json | 2 +- src/Microsoft.Extensions.Testing.Abstractions/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- src/dotnet/project.json | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/branchinfo.txt b/branchinfo.txt index ad298977a..ce86ccae5 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -4,6 +4,6 @@ MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_VERSION=0 -RELEASE_SUFFIX=preview2 +RELEASE_SUFFIX=preview3 CHANNEL=preview BRANCH_NAME=rel/1.0.0-preview2 diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index ec97f914a..59558d59f 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview2-*", + "version": "1.0.0-preview3-*", "buildOptions": { "keyFile": "../../tools/Key.snk", "warningsAsErrors": true diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 857b9115c..579192f43 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview2-*", + "version": "1.0.0-preview3-*", "buildOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 2757790c2..d09565e2e 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview2-*", + "version": "1.0.0-preview3-*", "buildOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index e229cd210..1e586c766 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -1,6 +1,6 @@ { "description": "Abstractions for making code that uses file system and environment testable.", - "version": "1.0.0-rc3-*", + "version": "1.0.0-rc4-*", "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 5512c57c8..744a47487 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview2-*", + "version": "1.0.0-preview3-*", "buildOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index fda9fa0a1..40d4dea15 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview2-*", + "version": "1.0.0-preview3-*", "buildOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 172393918..3075d1f6c 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc3-*", + "version": "1.0.0-rc4-*", "buildOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index a4b1a4cbb..76fc4473d 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview2-*", + "version": "1.0.0-preview3-*", "description": "Microsoft.DotNet.TestFramework Class Library", "buildOptions": { "keyFile": "../../tools/Key.snk" diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 86f7145a4..fa611fe1d 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -1,6 +1,6 @@ { "description": "Abstractions for reading `.deps` files.", - "version": "1.0.0-rc3-*", + "version": "1.0.0-rc4-*", "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk" diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 585ecc0a0..33696e1c9 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -1,6 +1,6 @@ { "description": "Abstractions for test runners to communicate to a tool, such as Visual Studio.", - "version": "1.0.0-preview2-*", + "version": "1.0.0-preview3-*", "buildOptions": { "warningsAsErrors": true, "allowUnsafe": true, diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 03ca1c2ca..53d87ed89 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview2-*", + "version": "1.0.0-preview3-*", "buildOptions": { "emitEntryPoint": true, "compile": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 81789c508..e3fd15ff8 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview2-*", + "version": "1.0.0-preview3-*", "buildOptions": { "emitEntryPoint": true, "embed": { From 1cfdb41cef3c6ff38cd55f9c5bf0dbb3e64da23c Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Fri, 3 Jun 2016 15:53:52 -0700 Subject: [PATCH 43/97] Initial commit of LZMA SDK This is a direct copy of the CS folder from the 16.02 SDK package. I've added a README to indicate where this code came from. --- .../LZMA/Common/CRC.cs | 55 + .../LZMA/Common/CommandLineParser.cs | 274 +++ .../LZMA/Common/InBuffer.cs | 72 + .../LZMA/Common/OutBuffer.cs | 47 + .../LZMA/Compress/LZ/IMatchFinder.cs | 24 + .../LZMA/Compress/LZ/LzBinTree.cs | 367 ++++ .../LZMA/Compress/LZ/LzInWindow.cs | 132 ++ .../LZMA/Compress/LZ/LzOutWindow.cs | 110 ++ .../LZMA/Compress/LZMA/LzmaBase.cs | 76 + .../LZMA/Compress/LZMA/LzmaDecoder.cs | 398 +++++ .../LZMA/Compress/LZMA/LzmaEncoder.cs | 1480 +++++++++++++++++ .../LZMA/Compress/LzmaAlone/LzmaAlone.cs | 364 ++++ .../LZMA/Compress/LzmaAlone/LzmaAlone.csproj | 90 + .../LZMA/Compress/LzmaAlone/LzmaAlone.sln | 20 + .../LZMA/Compress/LzmaAlone/LzmaBench.cs | 340 ++++ .../LzmaAlone/Properties/AssemblyInfo.cs | 29 + .../LzmaAlone/Properties/Resources.cs | 70 + .../Compress/LzmaAlone/Properties/Settings.cs | 42 + .../LZMA/Compress/RangeCoder/RangeCoder.cs | 234 +++ .../LZMA/Compress/RangeCoder/RangeCoderBit.cs | 117 ++ .../Compress/RangeCoder/RangeCoderBitTree.cs | 157 ++ src/Microsoft.DotNet.Archive/LZMA/ICoder.cs | 157 ++ src/Microsoft.DotNet.Archive/LZMA/README.md | 5 + 23 files changed, 4660 insertions(+) create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Common/CRC.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Common/CommandLineParser.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Common/InBuffer.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/IMatchFinder.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzBinTree.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzInWindow.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzOutWindow.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaBase.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaEncoder.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.csproj create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.sln create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaBench.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/AssemblyInfo.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Resources.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Settings.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoder.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBit.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBitTree.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/ICoder.cs create mode 100644 src/Microsoft.DotNet.Archive/LZMA/README.md diff --git a/src/Microsoft.DotNet.Archive/LZMA/Common/CRC.cs b/src/Microsoft.DotNet.Archive/LZMA/Common/CRC.cs new file mode 100644 index 000000000..82cc857ef --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Common/CRC.cs @@ -0,0 +1,55 @@ +// Common/CRC.cs + +namespace SevenZip +{ + class CRC + { + public static readonly uint[] Table; + + static CRC() + { + Table = new uint[256]; + const uint kPoly = 0xEDB88320; + for (uint i = 0; i < 256; i++) + { + uint r = i; + for (int j = 0; j < 8; j++) + if ((r & 1) != 0) + r = (r >> 1) ^ kPoly; + else + r >>= 1; + Table[i] = r; + } + } + + uint _value = 0xFFFFFFFF; + + public void Init() { _value = 0xFFFFFFFF; } + + public void UpdateByte(byte b) + { + _value = Table[(((byte)(_value)) ^ b)] ^ (_value >> 8); + } + + public void Update(byte[] data, uint offset, uint size) + { + for (uint i = 0; i < size; i++) + _value = Table[(((byte)(_value)) ^ data[offset + i])] ^ (_value >> 8); + } + + public uint GetDigest() { return _value ^ 0xFFFFFFFF; } + + static uint CalculateDigest(byte[] data, uint offset, uint size) + { + CRC crc = new CRC(); + // crc.Init(); + crc.Update(data, offset, size); + return crc.GetDigest(); + } + + static bool VerifyDigest(uint digest, byte[] data, uint offset, uint size) + { + return (CalculateDigest(data, offset, size) == digest); + } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Common/CommandLineParser.cs b/src/Microsoft.DotNet.Archive/LZMA/Common/CommandLineParser.cs new file mode 100644 index 000000000..8eabf59d1 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Common/CommandLineParser.cs @@ -0,0 +1,274 @@ +// CommandLineParser.cs + +using System; +using System.Collections; + +namespace SevenZip.CommandLineParser +{ + public enum SwitchType + { + Simple, + PostMinus, + LimitedPostString, + UnLimitedPostString, + PostChar + } + + public class SwitchForm + { + public string IDString; + public SwitchType Type; + public bool Multi; + public int MinLen; + public int MaxLen; + public string PostCharSet; + + public SwitchForm(string idString, SwitchType type, bool multi, + int minLen, int maxLen, string postCharSet) + { + IDString = idString; + Type = type; + Multi = multi; + MinLen = minLen; + MaxLen = maxLen; + PostCharSet = postCharSet; + } + public SwitchForm(string idString, SwitchType type, bool multi, int minLen): + this(idString, type, multi, minLen, 0, "") + { + } + public SwitchForm(string idString, SwitchType type, bool multi): + this(idString, type, multi, 0) + { + } + } + + public class SwitchResult + { + public bool ThereIs; + public bool WithMinus; + public ArrayList PostStrings = new ArrayList(); + public int PostCharIndex; + public SwitchResult() + { + ThereIs = false; + } + } + + public class Parser + { + public ArrayList NonSwitchStrings = new ArrayList(); + SwitchResult[] _switches; + + public Parser(int numSwitches) + { + _switches = new SwitchResult[numSwitches]; + for (int i = 0; i < numSwitches; i++) + _switches[i] = new SwitchResult(); + } + + bool ParseString(string srcString, SwitchForm[] switchForms) + { + int len = srcString.Length; + if (len == 0) + return false; + int pos = 0; + if (!IsItSwitchChar(srcString[pos])) + return false; + while (pos < len) + { + if (IsItSwitchChar(srcString[pos])) + pos++; + const int kNoLen = -1; + int matchedSwitchIndex = 0; + int maxLen = kNoLen; + for (int switchIndex = 0; switchIndex < _switches.Length; switchIndex++) + { + int switchLen = switchForms[switchIndex].IDString.Length; + if (switchLen <= maxLen || pos + switchLen > len) + continue; + if (String.Compare(switchForms[switchIndex].IDString, 0, + srcString, pos, switchLen, true) == 0) + { + matchedSwitchIndex = switchIndex; + maxLen = switchLen; + } + } + if (maxLen == kNoLen) + throw new Exception("maxLen == kNoLen"); + SwitchResult matchedSwitch = _switches[matchedSwitchIndex]; + SwitchForm switchForm = switchForms[matchedSwitchIndex]; + if ((!switchForm.Multi) && matchedSwitch.ThereIs) + throw new Exception("switch must be single"); + matchedSwitch.ThereIs = true; + pos += maxLen; + int tailSize = len - pos; + SwitchType type = switchForm.Type; + switch (type) + { + case SwitchType.PostMinus: + { + if (tailSize == 0) + matchedSwitch.WithMinus = false; + else + { + matchedSwitch.WithMinus = (srcString[pos] == kSwitchMinus); + if (matchedSwitch.WithMinus) + pos++; + } + break; + } + case SwitchType.PostChar: + { + if (tailSize < switchForm.MinLen) + throw new Exception("switch is not full"); + string charSet = switchForm.PostCharSet; + const int kEmptyCharValue = -1; + if (tailSize == 0) + matchedSwitch.PostCharIndex = kEmptyCharValue; + else + { + int index = charSet.IndexOf(srcString[pos]); + if (index < 0) + matchedSwitch.PostCharIndex = kEmptyCharValue; + else + { + matchedSwitch.PostCharIndex = index; + pos++; + } + } + break; + } + case SwitchType.LimitedPostString: + case SwitchType.UnLimitedPostString: + { + int minLen = switchForm.MinLen; + if (tailSize < minLen) + throw new Exception("switch is not full"); + if (type == SwitchType.UnLimitedPostString) + { + matchedSwitch.PostStrings.Add(srcString.Substring(pos)); + return true; + } + String stringSwitch = srcString.Substring(pos, minLen); + pos += minLen; + for (int i = minLen; i < switchForm.MaxLen && pos < len; i++, pos++) + { + char c = srcString[pos]; + if (IsItSwitchChar(c)) + break; + stringSwitch += c; + } + matchedSwitch.PostStrings.Add(stringSwitch); + break; + } + } + } + return true; + + } + + public void ParseStrings(SwitchForm[] switchForms, string[] commandStrings) + { + int numCommandStrings = commandStrings.Length; + bool stopSwitch = false; + for (int i = 0; i < numCommandStrings; i++) + { + string s = commandStrings[i]; + if (stopSwitch) + NonSwitchStrings.Add(s); + else + if (s == kStopSwitchParsing) + stopSwitch = true; + else + if (!ParseString(s, switchForms)) + NonSwitchStrings.Add(s); + } + } + + public SwitchResult this[int index] { get { return _switches[index]; } } + + public static int ParseCommand(CommandForm[] commandForms, string commandString, + out string postString) + { + for (int i = 0; i < commandForms.Length; i++) + { + string id = commandForms[i].IDString; + if (commandForms[i].PostStringMode) + { + if (commandString.IndexOf(id) == 0) + { + postString = commandString.Substring(id.Length); + return i; + } + } + else + if (commandString == id) + { + postString = ""; + return i; + } + } + postString = ""; + return -1; + } + + static bool ParseSubCharsCommand(int numForms, CommandSubCharsSet[] forms, + string commandString, ArrayList indices) + { + indices.Clear(); + int numUsedChars = 0; + for (int i = 0; i < numForms; i++) + { + CommandSubCharsSet charsSet = forms[i]; + int currentIndex = -1; + int len = charsSet.Chars.Length; + for (int j = 0; j < len; j++) + { + char c = charsSet.Chars[j]; + int newIndex = commandString.IndexOf(c); + if (newIndex >= 0) + { + if (currentIndex >= 0) + return false; + if (commandString.IndexOf(c, newIndex + 1) >= 0) + return false; + currentIndex = j; + numUsedChars++; + } + } + if (currentIndex == -1 && !charsSet.EmptyAllowed) + return false; + indices.Add(currentIndex); + } + return (numUsedChars == commandString.Length); + } + const char kSwitchID1 = '-'; + const char kSwitchID2 = '/'; + + const char kSwitchMinus = '-'; + const string kStopSwitchParsing = "--"; + + static bool IsItSwitchChar(char c) + { + return (c == kSwitchID1 || c == kSwitchID2); + } + } + + public class CommandForm + { + public string IDString = ""; + public bool PostStringMode = false; + public CommandForm(string idString, bool postStringMode) + { + IDString = idString; + PostStringMode = postStringMode; + } + } + + class CommandSubCharsSet + { + public string Chars = ""; + public bool EmptyAllowed = false; + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Common/InBuffer.cs b/src/Microsoft.DotNet.Archive/LZMA/Common/InBuffer.cs new file mode 100644 index 000000000..7c51f0bc0 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Common/InBuffer.cs @@ -0,0 +1,72 @@ +// InBuffer.cs + +namespace SevenZip.Buffer +{ + public class InBuffer + { + byte[] m_Buffer; + uint m_Pos; + uint m_Limit; + uint m_BufferSize; + System.IO.Stream m_Stream; + bool m_StreamWasExhausted; + ulong m_ProcessedSize; + + public InBuffer(uint bufferSize) + { + m_Buffer = new byte[bufferSize]; + m_BufferSize = bufferSize; + } + + public void Init(System.IO.Stream stream) + { + m_Stream = stream; + m_ProcessedSize = 0; + m_Limit = 0; + m_Pos = 0; + m_StreamWasExhausted = false; + } + + public bool ReadBlock() + { + if (m_StreamWasExhausted) + return false; + m_ProcessedSize += m_Pos; + int aNumProcessedBytes = m_Stream.Read(m_Buffer, 0, (int)m_BufferSize); + m_Pos = 0; + m_Limit = (uint)aNumProcessedBytes; + m_StreamWasExhausted = (aNumProcessedBytes == 0); + return (!m_StreamWasExhausted); + } + + + public void ReleaseStream() + { + // m_Stream.Close(); + m_Stream = null; + } + + public bool ReadByte(byte b) // check it + { + if (m_Pos >= m_Limit) + if (!ReadBlock()) + return false; + b = m_Buffer[m_Pos++]; + return true; + } + + public byte ReadByte() + { + // return (byte)m_Stream.ReadByte(); + if (m_Pos >= m_Limit) + if (!ReadBlock()) + return 0xFF; + return m_Buffer[m_Pos++]; + } + + public ulong GetProcessedSize() + { + return m_ProcessedSize + m_Pos; + } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs b/src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs new file mode 100644 index 000000000..2da16e162 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs @@ -0,0 +1,47 @@ +// OutBuffer.cs + +namespace SevenZip.Buffer +{ + public class OutBuffer + { + byte[] m_Buffer; + uint m_Pos; + uint m_BufferSize; + System.IO.Stream m_Stream; + ulong m_ProcessedSize; + + public OutBuffer(uint bufferSize) + { + m_Buffer = new byte[bufferSize]; + m_BufferSize = bufferSize; + } + + public void SetStream(System.IO.Stream stream) { m_Stream = stream; } + public void FlushStream() { m_Stream.Flush(); } + public void CloseStream() { m_Stream.Close(); } + public void ReleaseStream() { m_Stream = null; } + + public void Init() + { + m_ProcessedSize = 0; + m_Pos = 0; + } + + public void WriteByte(byte b) + { + m_Buffer[m_Pos++] = b; + if (m_Pos >= m_BufferSize) + FlushData(); + } + + public void FlushData() + { + if (m_Pos == 0) + return; + m_Stream.Write(m_Buffer, 0, (int)m_Pos); + m_Pos = 0; + } + + public ulong GetProcessedSize() { return m_ProcessedSize + m_Pos; } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/IMatchFinder.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/IMatchFinder.cs new file mode 100644 index 000000000..10ca2b37f --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/IMatchFinder.cs @@ -0,0 +1,24 @@ +// IMatchFinder.cs + +using System; + +namespace SevenZip.Compression.LZ +{ + interface IInWindowStream + { + void SetStream(System.IO.Stream inStream); + void Init(); + void ReleaseStream(); + Byte GetIndexByte(Int32 index); + UInt32 GetMatchLen(Int32 index, UInt32 distance, UInt32 limit); + UInt32 GetNumAvailableBytes(); + } + + interface IMatchFinder : IInWindowStream + { + void Create(UInt32 historySize, UInt32 keepAddBufferBefore, + UInt32 matchMaxLen, UInt32 keepAddBufferAfter); + UInt32 GetMatches(UInt32[] distances); + void Skip(UInt32 num); + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzBinTree.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzBinTree.cs new file mode 100644 index 000000000..c1c006b63 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzBinTree.cs @@ -0,0 +1,367 @@ +// LzBinTree.cs + +using System; + +namespace SevenZip.Compression.LZ +{ + public class BinTree : InWindow, IMatchFinder + { + UInt32 _cyclicBufferPos; + UInt32 _cyclicBufferSize = 0; + UInt32 _matchMaxLen; + + UInt32[] _son; + UInt32[] _hash; + + UInt32 _cutValue = 0xFF; + UInt32 _hashMask; + UInt32 _hashSizeSum = 0; + + bool HASH_ARRAY = true; + + const UInt32 kHash2Size = 1 << 10; + const UInt32 kHash3Size = 1 << 16; + const UInt32 kBT2HashSize = 1 << 16; + const UInt32 kStartMaxLen = 1; + const UInt32 kHash3Offset = kHash2Size; + const UInt32 kEmptyHashValue = 0; + const UInt32 kMaxValForNormalize = ((UInt32)1 << 31) - 1; + + UInt32 kNumHashDirectBytes = 0; + UInt32 kMinMatchCheck = 4; + UInt32 kFixHashSize = kHash2Size + kHash3Size; + + public void SetType(int numHashBytes) + { + HASH_ARRAY = (numHashBytes > 2); + if (HASH_ARRAY) + { + kNumHashDirectBytes = 0; + kMinMatchCheck = 4; + kFixHashSize = kHash2Size + kHash3Size; + } + else + { + kNumHashDirectBytes = 2; + kMinMatchCheck = 2 + 1; + kFixHashSize = 0; + } + } + + public new void SetStream(System.IO.Stream stream) { base.SetStream(stream); } + public new void ReleaseStream() { base.ReleaseStream(); } + + public new void Init() + { + base.Init(); + for (UInt32 i = 0; i < _hashSizeSum; i++) + _hash[i] = kEmptyHashValue; + _cyclicBufferPos = 0; + ReduceOffsets(-1); + } + + public new void MovePos() + { + if (++_cyclicBufferPos >= _cyclicBufferSize) + _cyclicBufferPos = 0; + base.MovePos(); + if (_pos == kMaxValForNormalize) + Normalize(); + } + + public new Byte GetIndexByte(Int32 index) { return base.GetIndexByte(index); } + + public new UInt32 GetMatchLen(Int32 index, UInt32 distance, UInt32 limit) + { return base.GetMatchLen(index, distance, limit); } + + public new UInt32 GetNumAvailableBytes() { return base.GetNumAvailableBytes(); } + + public void Create(UInt32 historySize, UInt32 keepAddBufferBefore, + UInt32 matchMaxLen, UInt32 keepAddBufferAfter) + { + if (historySize > kMaxValForNormalize - 256) + throw new Exception(); + _cutValue = 16 + (matchMaxLen >> 1); + + UInt32 windowReservSize = (historySize + keepAddBufferBefore + + matchMaxLen + keepAddBufferAfter) / 2 + 256; + + base.Create(historySize + keepAddBufferBefore, matchMaxLen + keepAddBufferAfter, windowReservSize); + + _matchMaxLen = matchMaxLen; + + UInt32 cyclicBufferSize = historySize + 1; + if (_cyclicBufferSize != cyclicBufferSize) + _son = new UInt32[(_cyclicBufferSize = cyclicBufferSize) * 2]; + + UInt32 hs = kBT2HashSize; + + if (HASH_ARRAY) + { + hs = historySize - 1; + hs |= (hs >> 1); + hs |= (hs >> 2); + hs |= (hs >> 4); + hs |= (hs >> 8); + hs >>= 1; + hs |= 0xFFFF; + if (hs > (1 << 24)) + hs >>= 1; + _hashMask = hs; + hs++; + hs += kFixHashSize; + } + if (hs != _hashSizeSum) + _hash = new UInt32[_hashSizeSum = hs]; + } + + public UInt32 GetMatches(UInt32[] distances) + { + UInt32 lenLimit; + if (_pos + _matchMaxLen <= _streamPos) + lenLimit = _matchMaxLen; + else + { + lenLimit = _streamPos - _pos; + if (lenLimit < kMinMatchCheck) + { + MovePos(); + return 0; + } + } + + UInt32 offset = 0; + UInt32 matchMinPos = (_pos > _cyclicBufferSize) ? (_pos - _cyclicBufferSize) : 0; + UInt32 cur = _bufferOffset + _pos; + UInt32 maxLen = kStartMaxLen; // to avoid items for len < hashSize; + UInt32 hashValue, hash2Value = 0, hash3Value = 0; + + if (HASH_ARRAY) + { + UInt32 temp = CRC.Table[_bufferBase[cur]] ^ _bufferBase[cur + 1]; + hash2Value = temp & (kHash2Size - 1); + temp ^= ((UInt32)(_bufferBase[cur + 2]) << 8); + hash3Value = temp & (kHash3Size - 1); + hashValue = (temp ^ (CRC.Table[_bufferBase[cur + 3]] << 5)) & _hashMask; + } + else + hashValue = _bufferBase[cur] ^ ((UInt32)(_bufferBase[cur + 1]) << 8); + + UInt32 curMatch = _hash[kFixHashSize + hashValue]; + if (HASH_ARRAY) + { + UInt32 curMatch2 = _hash[hash2Value]; + UInt32 curMatch3 = _hash[kHash3Offset + hash3Value]; + _hash[hash2Value] = _pos; + _hash[kHash3Offset + hash3Value] = _pos; + if (curMatch2 > matchMinPos) + if (_bufferBase[_bufferOffset + curMatch2] == _bufferBase[cur]) + { + distances[offset++] = maxLen = 2; + distances[offset++] = _pos - curMatch2 - 1; + } + if (curMatch3 > matchMinPos) + if (_bufferBase[_bufferOffset + curMatch3] == _bufferBase[cur]) + { + if (curMatch3 == curMatch2) + offset -= 2; + distances[offset++] = maxLen = 3; + distances[offset++] = _pos - curMatch3 - 1; + curMatch2 = curMatch3; + } + if (offset != 0 && curMatch2 == curMatch) + { + offset -= 2; + maxLen = kStartMaxLen; + } + } + + _hash[kFixHashSize + hashValue] = _pos; + + UInt32 ptr0 = (_cyclicBufferPos << 1) + 1; + UInt32 ptr1 = (_cyclicBufferPos << 1); + + UInt32 len0, len1; + len0 = len1 = kNumHashDirectBytes; + + if (kNumHashDirectBytes != 0) + { + if (curMatch > matchMinPos) + { + if (_bufferBase[_bufferOffset + curMatch + kNumHashDirectBytes] != + _bufferBase[cur + kNumHashDirectBytes]) + { + distances[offset++] = maxLen = kNumHashDirectBytes; + distances[offset++] = _pos - curMatch - 1; + } + } + } + + UInt32 count = _cutValue; + + while(true) + { + if(curMatch <= matchMinPos || count-- == 0) + { + _son[ptr0] = _son[ptr1] = kEmptyHashValue; + break; + } + UInt32 delta = _pos - curMatch; + UInt32 cyclicPos = ((delta <= _cyclicBufferPos) ? + (_cyclicBufferPos - delta) : + (_cyclicBufferPos - delta + _cyclicBufferSize)) << 1; + + UInt32 pby1 = _bufferOffset + curMatch; + UInt32 len = Math.Min(len0, len1); + if (_bufferBase[pby1 + len] == _bufferBase[cur + len]) + { + while(++len != lenLimit) + if (_bufferBase[pby1 + len] != _bufferBase[cur + len]) + break; + if (maxLen < len) + { + distances[offset++] = maxLen = len; + distances[offset++] = delta - 1; + if (len == lenLimit) + { + _son[ptr1] = _son[cyclicPos]; + _son[ptr0] = _son[cyclicPos + 1]; + break; + } + } + } + if (_bufferBase[pby1 + len] < _bufferBase[cur + len]) + { + _son[ptr1] = curMatch; + ptr1 = cyclicPos + 1; + curMatch = _son[ptr1]; + len1 = len; + } + else + { + _son[ptr0] = curMatch; + ptr0 = cyclicPos; + curMatch = _son[ptr0]; + len0 = len; + } + } + MovePos(); + return offset; + } + + public void Skip(UInt32 num) + { + do + { + UInt32 lenLimit; + if (_pos + _matchMaxLen <= _streamPos) + lenLimit = _matchMaxLen; + else + { + lenLimit = _streamPos - _pos; + if (lenLimit < kMinMatchCheck) + { + MovePos(); + continue; + } + } + + UInt32 matchMinPos = (_pos > _cyclicBufferSize) ? (_pos - _cyclicBufferSize) : 0; + UInt32 cur = _bufferOffset + _pos; + + UInt32 hashValue; + + if (HASH_ARRAY) + { + UInt32 temp = CRC.Table[_bufferBase[cur]] ^ _bufferBase[cur + 1]; + UInt32 hash2Value = temp & (kHash2Size - 1); + _hash[hash2Value] = _pos; + temp ^= ((UInt32)(_bufferBase[cur + 2]) << 8); + UInt32 hash3Value = temp & (kHash3Size - 1); + _hash[kHash3Offset + hash3Value] = _pos; + hashValue = (temp ^ (CRC.Table[_bufferBase[cur + 3]] << 5)) & _hashMask; + } + else + hashValue = _bufferBase[cur] ^ ((UInt32)(_bufferBase[cur + 1]) << 8); + + UInt32 curMatch = _hash[kFixHashSize + hashValue]; + _hash[kFixHashSize + hashValue] = _pos; + + UInt32 ptr0 = (_cyclicBufferPos << 1) + 1; + UInt32 ptr1 = (_cyclicBufferPos << 1); + + UInt32 len0, len1; + len0 = len1 = kNumHashDirectBytes; + + UInt32 count = _cutValue; + while (true) + { + if (curMatch <= matchMinPos || count-- == 0) + { + _son[ptr0] = _son[ptr1] = kEmptyHashValue; + break; + } + + UInt32 delta = _pos - curMatch; + UInt32 cyclicPos = ((delta <= _cyclicBufferPos) ? + (_cyclicBufferPos - delta) : + (_cyclicBufferPos - delta + _cyclicBufferSize)) << 1; + + UInt32 pby1 = _bufferOffset + curMatch; + UInt32 len = Math.Min(len0, len1); + if (_bufferBase[pby1 + len] == _bufferBase[cur + len]) + { + while (++len != lenLimit) + if (_bufferBase[pby1 + len] != _bufferBase[cur + len]) + break; + if (len == lenLimit) + { + _son[ptr1] = _son[cyclicPos]; + _son[ptr0] = _son[cyclicPos + 1]; + break; + } + } + if (_bufferBase[pby1 + len] < _bufferBase[cur + len]) + { + _son[ptr1] = curMatch; + ptr1 = cyclicPos + 1; + curMatch = _son[ptr1]; + len1 = len; + } + else + { + _son[ptr0] = curMatch; + ptr0 = cyclicPos; + curMatch = _son[ptr0]; + len0 = len; + } + } + MovePos(); + } + while (--num != 0); + } + + void NormalizeLinks(UInt32[] items, UInt32 numItems, UInt32 subValue) + { + for (UInt32 i = 0; i < numItems; i++) + { + UInt32 value = items[i]; + if (value <= subValue) + value = kEmptyHashValue; + else + value -= subValue; + items[i] = value; + } + } + + void Normalize() + { + UInt32 subValue = _pos - _cyclicBufferSize; + NormalizeLinks(_son, _cyclicBufferSize * 2, subValue); + NormalizeLinks(_hash, _hashSizeSum, subValue); + ReduceOffsets((Int32)subValue); + } + + public void SetCutValue(UInt32 cutValue) { _cutValue = cutValue; } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzInWindow.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzInWindow.cs new file mode 100644 index 000000000..52d23ce39 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzInWindow.cs @@ -0,0 +1,132 @@ +// LzInWindow.cs + +using System; + +namespace SevenZip.Compression.LZ +{ + public class InWindow + { + public Byte[] _bufferBase = null; // pointer to buffer with data + System.IO.Stream _stream; + UInt32 _posLimit; // offset (from _buffer) of first byte when new block reading must be done + bool _streamEndWasReached; // if (true) then _streamPos shows real end of stream + + UInt32 _pointerToLastSafePosition; + + public UInt32 _bufferOffset; + + public UInt32 _blockSize; // Size of Allocated memory block + public UInt32 _pos; // offset (from _buffer) of curent byte + UInt32 _keepSizeBefore; // how many BYTEs must be kept in buffer before _pos + UInt32 _keepSizeAfter; // how many BYTEs must be kept buffer after _pos + public UInt32 _streamPos; // offset (from _buffer) of first not read byte from Stream + + public void MoveBlock() + { + UInt32 offset = (UInt32)(_bufferOffset) + _pos - _keepSizeBefore; + // we need one additional byte, since MovePos moves on 1 byte. + if (offset > 0) + offset--; + + UInt32 numBytes = (UInt32)(_bufferOffset) + _streamPos - offset; + + // check negative offset ???? + for (UInt32 i = 0; i < numBytes; i++) + _bufferBase[i] = _bufferBase[offset + i]; + _bufferOffset -= offset; + } + + public virtual void ReadBlock() + { + if (_streamEndWasReached) + return; + while (true) + { + int size = (int)((0 - _bufferOffset) + _blockSize - _streamPos); + if (size == 0) + return; + int numReadBytes = _stream.Read(_bufferBase, (int)(_bufferOffset + _streamPos), size); + if (numReadBytes == 0) + { + _posLimit = _streamPos; + UInt32 pointerToPostion = _bufferOffset + _posLimit; + if (pointerToPostion > _pointerToLastSafePosition) + _posLimit = (UInt32)(_pointerToLastSafePosition - _bufferOffset); + + _streamEndWasReached = true; + return; + } + _streamPos += (UInt32)numReadBytes; + if (_streamPos >= _pos + _keepSizeAfter) + _posLimit = _streamPos - _keepSizeAfter; + } + } + + void Free() { _bufferBase = null; } + + public void Create(UInt32 keepSizeBefore, UInt32 keepSizeAfter, UInt32 keepSizeReserv) + { + _keepSizeBefore = keepSizeBefore; + _keepSizeAfter = keepSizeAfter; + UInt32 blockSize = keepSizeBefore + keepSizeAfter + keepSizeReserv; + if (_bufferBase == null || _blockSize != blockSize) + { + Free(); + _blockSize = blockSize; + _bufferBase = new Byte[_blockSize]; + } + _pointerToLastSafePosition = _blockSize - keepSizeAfter; + } + + public void SetStream(System.IO.Stream stream) { _stream = stream; } + public void ReleaseStream() { _stream = null; } + + public void Init() + { + _bufferOffset = 0; + _pos = 0; + _streamPos = 0; + _streamEndWasReached = false; + ReadBlock(); + } + + public void MovePos() + { + _pos++; + if (_pos > _posLimit) + { + UInt32 pointerToPostion = _bufferOffset + _pos; + if (pointerToPostion > _pointerToLastSafePosition) + MoveBlock(); + ReadBlock(); + } + } + + public Byte GetIndexByte(Int32 index) { return _bufferBase[_bufferOffset + _pos + index]; } + + // index + limit have not to exceed _keepSizeAfter; + public UInt32 GetMatchLen(Int32 index, UInt32 distance, UInt32 limit) + { + if (_streamEndWasReached) + if ((_pos + index) + limit > _streamPos) + limit = _streamPos - (UInt32)(_pos + index); + distance++; + // Byte *pby = _buffer + (size_t)_pos + index; + UInt32 pby = _bufferOffset + _pos + (UInt32)index; + + UInt32 i; + for (i = 0; i < limit && _bufferBase[pby + i] == _bufferBase[pby + i - distance]; i++); + return i; + } + + public UInt32 GetNumAvailableBytes() { return _streamPos - _pos; } + + public void ReduceOffsets(Int32 subValue) + { + _bufferOffset += (UInt32)subValue; + _posLimit -= (UInt32)subValue; + _pos -= (UInt32)subValue; + _streamPos -= (UInt32)subValue; + } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzOutWindow.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzOutWindow.cs new file mode 100644 index 000000000..c998584ac --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzOutWindow.cs @@ -0,0 +1,110 @@ +// LzOutWindow.cs + +namespace SevenZip.Compression.LZ +{ + public class OutWindow + { + byte[] _buffer = null; + uint _pos; + uint _windowSize = 0; + uint _streamPos; + System.IO.Stream _stream; + + public uint TrainSize = 0; + + public void Create(uint windowSize) + { + if (_windowSize != windowSize) + { + // System.GC.Collect(); + _buffer = new byte[windowSize]; + } + _windowSize = windowSize; + _pos = 0; + _streamPos = 0; + } + + public void Init(System.IO.Stream stream, bool solid) + { + ReleaseStream(); + _stream = stream; + if (!solid) + { + _streamPos = 0; + _pos = 0; + TrainSize = 0; + } + } + + public bool Train(System.IO.Stream stream) + { + long len = stream.Length; + uint size = (len < _windowSize) ? (uint)len : _windowSize; + TrainSize = size; + stream.Position = len - size; + _streamPos = _pos = 0; + while (size > 0) + { + uint curSize = _windowSize - _pos; + if (size < curSize) + curSize = size; + int numReadBytes = stream.Read(_buffer, (int)_pos, (int)curSize); + if (numReadBytes == 0) + return false; + size -= (uint)numReadBytes; + _pos += (uint)numReadBytes; + _streamPos += (uint)numReadBytes; + if (_pos == _windowSize) + _streamPos = _pos = 0; + } + return true; + } + + public void ReleaseStream() + { + Flush(); + _stream = null; + } + + public void Flush() + { + uint size = _pos - _streamPos; + if (size == 0) + return; + _stream.Write(_buffer, (int)_streamPos, (int)size); + if (_pos >= _windowSize) + _pos = 0; + _streamPos = _pos; + } + + public void CopyBlock(uint distance, uint len) + { + uint pos = _pos - distance - 1; + if (pos >= _windowSize) + pos += _windowSize; + for (; len > 0; len--) + { + if (pos >= _windowSize) + pos = 0; + _buffer[_pos++] = _buffer[pos++]; + if (_pos >= _windowSize) + Flush(); + } + } + + public void PutByte(byte b) + { + _buffer[_pos++] = b; + if (_pos >= _windowSize) + Flush(); + } + + public byte GetByte(uint distance) + { + uint pos = _pos - distance - 1; + if (pos >= _windowSize) + pos += _windowSize; + return _buffer[pos]; + } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaBase.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaBase.cs new file mode 100644 index 000000000..c7bca86f5 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaBase.cs @@ -0,0 +1,76 @@ +// LzmaBase.cs + +namespace SevenZip.Compression.LZMA +{ + internal abstract class Base + { + public const uint kNumRepDistances = 4; + public const uint kNumStates = 12; + + // static byte []kLiteralNextStates = {0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 4, 5}; + // static byte []kMatchNextStates = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10}; + // static byte []kRepNextStates = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11}; + // static byte []kShortRepNextStates = {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11}; + + public struct State + { + public uint Index; + public void Init() { Index = 0; } + public void UpdateChar() + { + if (Index < 4) Index = 0; + else if (Index < 10) Index -= 3; + else Index -= 6; + } + public void UpdateMatch() { Index = (uint)(Index < 7 ? 7 : 10); } + public void UpdateRep() { Index = (uint)(Index < 7 ? 8 : 11); } + public void UpdateShortRep() { Index = (uint)(Index < 7 ? 9 : 11); } + public bool IsCharState() { return Index < 7; } + } + + public const int kNumPosSlotBits = 6; + public const int kDicLogSizeMin = 0; + // public const int kDicLogSizeMax = 30; + // public const uint kDistTableSizeMax = kDicLogSizeMax * 2; + + public const int kNumLenToPosStatesBits = 2; // it's for speed optimization + public const uint kNumLenToPosStates = 1 << kNumLenToPosStatesBits; + + public const uint kMatchMinLen = 2; + + public static uint GetLenToPosState(uint len) + { + len -= kMatchMinLen; + if (len < kNumLenToPosStates) + return len; + return (uint)(kNumLenToPosStates - 1); + } + + public const int kNumAlignBits = 4; + public const uint kAlignTableSize = 1 << kNumAlignBits; + public const uint kAlignMask = (kAlignTableSize - 1); + + public const uint kStartPosModelIndex = 4; + public const uint kEndPosModelIndex = 14; + public const uint kNumPosModels = kEndPosModelIndex - kStartPosModelIndex; + + public const uint kNumFullDistances = 1 << ((int)kEndPosModelIndex / 2); + + public const uint kNumLitPosStatesBitsEncodingMax = 4; + public const uint kNumLitContextBitsMax = 8; + + public const int kNumPosStatesBitsMax = 4; + public const uint kNumPosStatesMax = (1 << kNumPosStatesBitsMax); + public const int kNumPosStatesBitsEncodingMax = 4; + public const uint kNumPosStatesEncodingMax = (1 << kNumPosStatesBitsEncodingMax); + + public const int kNumLowLenBits = 3; + public const int kNumMidLenBits = 3; + public const int kNumHighLenBits = 8; + public const uint kNumLowLenSymbols = 1 << kNumLowLenBits; + public const uint kNumMidLenSymbols = 1 << kNumMidLenBits; + public const uint kNumLenSymbols = kNumLowLenSymbols + kNumMidLenSymbols + + (1 << kNumHighLenBits); + public const uint kMatchMaxLen = kMatchMinLen + kNumLenSymbols - 1; + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs new file mode 100644 index 000000000..a9be39fc9 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs @@ -0,0 +1,398 @@ +// LzmaDecoder.cs + +using System; + +namespace SevenZip.Compression.LZMA +{ + using RangeCoder; + + public class Decoder : ICoder, ISetDecoderProperties // ,System.IO.Stream + { + class LenDecoder + { + BitDecoder m_Choice = new BitDecoder(); + BitDecoder m_Choice2 = new BitDecoder(); + BitTreeDecoder[] m_LowCoder = new BitTreeDecoder[Base.kNumPosStatesMax]; + BitTreeDecoder[] m_MidCoder = new BitTreeDecoder[Base.kNumPosStatesMax]; + BitTreeDecoder m_HighCoder = new BitTreeDecoder(Base.kNumHighLenBits); + uint m_NumPosStates = 0; + + public void Create(uint numPosStates) + { + for (uint posState = m_NumPosStates; posState < numPosStates; posState++) + { + m_LowCoder[posState] = new BitTreeDecoder(Base.kNumLowLenBits); + m_MidCoder[posState] = new BitTreeDecoder(Base.kNumMidLenBits); + } + m_NumPosStates = numPosStates; + } + + public void Init() + { + m_Choice.Init(); + for (uint posState = 0; posState < m_NumPosStates; posState++) + { + m_LowCoder[posState].Init(); + m_MidCoder[posState].Init(); + } + m_Choice2.Init(); + m_HighCoder.Init(); + } + + public uint Decode(RangeCoder.Decoder rangeDecoder, uint posState) + { + if (m_Choice.Decode(rangeDecoder) == 0) + return m_LowCoder[posState].Decode(rangeDecoder); + else + { + uint symbol = Base.kNumLowLenSymbols; + if (m_Choice2.Decode(rangeDecoder) == 0) + symbol += m_MidCoder[posState].Decode(rangeDecoder); + else + { + symbol += Base.kNumMidLenSymbols; + symbol += m_HighCoder.Decode(rangeDecoder); + } + return symbol; + } + } + } + + class LiteralDecoder + { + struct Decoder2 + { + BitDecoder[] m_Decoders; + public void Create() { m_Decoders = new BitDecoder[0x300]; } + public void Init() { for (int i = 0; i < 0x300; i++) m_Decoders[i].Init(); } + + public byte DecodeNormal(RangeCoder.Decoder rangeDecoder) + { + uint symbol = 1; + do + symbol = (symbol << 1) | m_Decoders[symbol].Decode(rangeDecoder); + while (symbol < 0x100); + return (byte)symbol; + } + + public byte DecodeWithMatchByte(RangeCoder.Decoder rangeDecoder, byte matchByte) + { + uint symbol = 1; + do + { + uint matchBit = (uint)(matchByte >> 7) & 1; + matchByte <<= 1; + uint bit = m_Decoders[((1 + matchBit) << 8) + symbol].Decode(rangeDecoder); + symbol = (symbol << 1) | bit; + if (matchBit != bit) + { + while (symbol < 0x100) + symbol = (symbol << 1) | m_Decoders[symbol].Decode(rangeDecoder); + break; + } + } + while (symbol < 0x100); + return (byte)symbol; + } + } + + Decoder2[] m_Coders; + int m_NumPrevBits; + int m_NumPosBits; + uint m_PosMask; + + public void Create(int numPosBits, int numPrevBits) + { + if (m_Coders != null && m_NumPrevBits == numPrevBits && + m_NumPosBits == numPosBits) + return; + m_NumPosBits = numPosBits; + m_PosMask = ((uint)1 << numPosBits) - 1; + m_NumPrevBits = numPrevBits; + uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits); + m_Coders = new Decoder2[numStates]; + for (uint i = 0; i < numStates; i++) + m_Coders[i].Create(); + } + + public void Init() + { + uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits); + for (uint i = 0; i < numStates; i++) + m_Coders[i].Init(); + } + + uint GetState(uint pos, byte prevByte) + { return ((pos & m_PosMask) << m_NumPrevBits) + (uint)(prevByte >> (8 - m_NumPrevBits)); } + + public byte DecodeNormal(RangeCoder.Decoder rangeDecoder, uint pos, byte prevByte) + { return m_Coders[GetState(pos, prevByte)].DecodeNormal(rangeDecoder); } + + public byte DecodeWithMatchByte(RangeCoder.Decoder rangeDecoder, uint pos, byte prevByte, byte matchByte) + { return m_Coders[GetState(pos, prevByte)].DecodeWithMatchByte(rangeDecoder, matchByte); } + }; + + LZ.OutWindow m_OutWindow = new LZ.OutWindow(); + RangeCoder.Decoder m_RangeDecoder = new RangeCoder.Decoder(); + + BitDecoder[] m_IsMatchDecoders = new BitDecoder[Base.kNumStates << Base.kNumPosStatesBitsMax]; + BitDecoder[] m_IsRepDecoders = new BitDecoder[Base.kNumStates]; + BitDecoder[] m_IsRepG0Decoders = new BitDecoder[Base.kNumStates]; + BitDecoder[] m_IsRepG1Decoders = new BitDecoder[Base.kNumStates]; + BitDecoder[] m_IsRepG2Decoders = new BitDecoder[Base.kNumStates]; + BitDecoder[] m_IsRep0LongDecoders = new BitDecoder[Base.kNumStates << Base.kNumPosStatesBitsMax]; + + BitTreeDecoder[] m_PosSlotDecoder = new BitTreeDecoder[Base.kNumLenToPosStates]; + BitDecoder[] m_PosDecoders = new BitDecoder[Base.kNumFullDistances - Base.kEndPosModelIndex]; + + BitTreeDecoder m_PosAlignDecoder = new BitTreeDecoder(Base.kNumAlignBits); + + LenDecoder m_LenDecoder = new LenDecoder(); + LenDecoder m_RepLenDecoder = new LenDecoder(); + + LiteralDecoder m_LiteralDecoder = new LiteralDecoder(); + + uint m_DictionarySize; + uint m_DictionarySizeCheck; + + uint m_PosStateMask; + + public Decoder() + { + m_DictionarySize = 0xFFFFFFFF; + for (int i = 0; i < Base.kNumLenToPosStates; i++) + m_PosSlotDecoder[i] = new BitTreeDecoder(Base.kNumPosSlotBits); + } + + void SetDictionarySize(uint dictionarySize) + { + if (m_DictionarySize != dictionarySize) + { + m_DictionarySize = dictionarySize; + m_DictionarySizeCheck = Math.Max(m_DictionarySize, 1); + uint blockSize = Math.Max(m_DictionarySizeCheck, (1 << 12)); + m_OutWindow.Create(blockSize); + } + } + + void SetLiteralProperties(int lp, int lc) + { + if (lp > 8) + throw new InvalidParamException(); + if (lc > 8) + throw new InvalidParamException(); + m_LiteralDecoder.Create(lp, lc); + } + + void SetPosBitsProperties(int pb) + { + if (pb > Base.kNumPosStatesBitsMax) + throw new InvalidParamException(); + uint numPosStates = (uint)1 << pb; + m_LenDecoder.Create(numPosStates); + m_RepLenDecoder.Create(numPosStates); + m_PosStateMask = numPosStates - 1; + } + + bool _solid = false; + void Init(System.IO.Stream inStream, System.IO.Stream outStream) + { + m_RangeDecoder.Init(inStream); + m_OutWindow.Init(outStream, _solid); + + uint i; + for (i = 0; i < Base.kNumStates; i++) + { + for (uint j = 0; j <= m_PosStateMask; j++) + { + uint index = (i << Base.kNumPosStatesBitsMax) + j; + m_IsMatchDecoders[index].Init(); + m_IsRep0LongDecoders[index].Init(); + } + m_IsRepDecoders[i].Init(); + m_IsRepG0Decoders[i].Init(); + m_IsRepG1Decoders[i].Init(); + m_IsRepG2Decoders[i].Init(); + } + + m_LiteralDecoder.Init(); + for (i = 0; i < Base.kNumLenToPosStates; i++) + m_PosSlotDecoder[i].Init(); + // m_PosSpecDecoder.Init(); + for (i = 0; i < Base.kNumFullDistances - Base.kEndPosModelIndex; i++) + m_PosDecoders[i].Init(); + + m_LenDecoder.Init(); + m_RepLenDecoder.Init(); + m_PosAlignDecoder.Init(); + } + + public void Code(System.IO.Stream inStream, System.IO.Stream outStream, + Int64 inSize, Int64 outSize, ICodeProgress progress) + { + Init(inStream, outStream); + + Base.State state = new Base.State(); + state.Init(); + uint rep0 = 0, rep1 = 0, rep2 = 0, rep3 = 0; + + UInt64 nowPos64 = 0; + UInt64 outSize64 = (UInt64)outSize; + if (nowPos64 < outSize64) + { + if (m_IsMatchDecoders[state.Index << Base.kNumPosStatesBitsMax].Decode(m_RangeDecoder) != 0) + throw new DataErrorException(); + state.UpdateChar(); + byte b = m_LiteralDecoder.DecodeNormal(m_RangeDecoder, 0, 0); + m_OutWindow.PutByte(b); + nowPos64++; + } + while (nowPos64 < outSize64) + { + // UInt64 next = Math.Min(nowPos64 + (1 << 18), outSize64); + // while(nowPos64 < next) + { + uint posState = (uint)nowPos64 & m_PosStateMask; + if (m_IsMatchDecoders[(state.Index << Base.kNumPosStatesBitsMax) + posState].Decode(m_RangeDecoder) == 0) + { + byte b; + byte prevByte = m_OutWindow.GetByte(0); + if (!state.IsCharState()) + b = m_LiteralDecoder.DecodeWithMatchByte(m_RangeDecoder, + (uint)nowPos64, prevByte, m_OutWindow.GetByte(rep0)); + else + b = m_LiteralDecoder.DecodeNormal(m_RangeDecoder, (uint)nowPos64, prevByte); + m_OutWindow.PutByte(b); + state.UpdateChar(); + nowPos64++; + } + else + { + uint len; + if (m_IsRepDecoders[state.Index].Decode(m_RangeDecoder) == 1) + { + if (m_IsRepG0Decoders[state.Index].Decode(m_RangeDecoder) == 0) + { + if (m_IsRep0LongDecoders[(state.Index << Base.kNumPosStatesBitsMax) + posState].Decode(m_RangeDecoder) == 0) + { + state.UpdateShortRep(); + m_OutWindow.PutByte(m_OutWindow.GetByte(rep0)); + nowPos64++; + continue; + } + } + else + { + UInt32 distance; + if (m_IsRepG1Decoders[state.Index].Decode(m_RangeDecoder) == 0) + { + distance = rep1; + } + else + { + if (m_IsRepG2Decoders[state.Index].Decode(m_RangeDecoder) == 0) + distance = rep2; + else + { + distance = rep3; + rep3 = rep2; + } + rep2 = rep1; + } + rep1 = rep0; + rep0 = distance; + } + len = m_RepLenDecoder.Decode(m_RangeDecoder, posState) + Base.kMatchMinLen; + state.UpdateRep(); + } + else + { + rep3 = rep2; + rep2 = rep1; + rep1 = rep0; + len = Base.kMatchMinLen + m_LenDecoder.Decode(m_RangeDecoder, posState); + state.UpdateMatch(); + uint posSlot = m_PosSlotDecoder[Base.GetLenToPosState(len)].Decode(m_RangeDecoder); + if (posSlot >= Base.kStartPosModelIndex) + { + int numDirectBits = (int)((posSlot >> 1) - 1); + rep0 = ((2 | (posSlot & 1)) << numDirectBits); + if (posSlot < Base.kEndPosModelIndex) + rep0 += BitTreeDecoder.ReverseDecode(m_PosDecoders, + rep0 - posSlot - 1, m_RangeDecoder, numDirectBits); + else + { + rep0 += (m_RangeDecoder.DecodeDirectBits( + numDirectBits - Base.kNumAlignBits) << Base.kNumAlignBits); + rep0 += m_PosAlignDecoder.ReverseDecode(m_RangeDecoder); + } + } + else + rep0 = posSlot; + } + if (rep0 >= m_OutWindow.TrainSize + nowPos64 || rep0 >= m_DictionarySizeCheck) + { + if (rep0 == 0xFFFFFFFF) + break; + throw new DataErrorException(); + } + m_OutWindow.CopyBlock(rep0, len); + nowPos64 += len; + } + } + } + m_OutWindow.Flush(); + m_OutWindow.ReleaseStream(); + m_RangeDecoder.ReleaseStream(); + } + + public void SetDecoderProperties(byte[] properties) + { + if (properties.Length < 5) + throw new InvalidParamException(); + int lc = properties[0] % 9; + int remainder = properties[0] / 9; + int lp = remainder % 5; + int pb = remainder / 5; + if (pb > Base.kNumPosStatesBitsMax) + throw new InvalidParamException(); + UInt32 dictionarySize = 0; + for (int i = 0; i < 4; i++) + dictionarySize += ((UInt32)(properties[1 + i])) << (i * 8); + SetDictionarySize(dictionarySize); + SetLiteralProperties(lp, lc); + SetPosBitsProperties(pb); + } + + public bool Train(System.IO.Stream stream) + { + _solid = true; + return m_OutWindow.Train(stream); + } + + /* + public override bool CanRead { get { return true; }} + public override bool CanWrite { get { return true; }} + public override bool CanSeek { get { return true; }} + public override long Length { get { return 0; }} + public override long Position + { + get { return 0; } + set { } + } + public override void Flush() { } + public override int Read(byte[] buffer, int offset, int count) + { + return 0; + } + public override void Write(byte[] buffer, int offset, int count) + { + } + public override long Seek(long offset, System.IO.SeekOrigin origin) + { + return 0; + } + public override void SetLength(long value) {} + */ + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaEncoder.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaEncoder.cs new file mode 100644 index 000000000..0237c51f1 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaEncoder.cs @@ -0,0 +1,1480 @@ +// LzmaEncoder.cs + +using System; + +namespace SevenZip.Compression.LZMA +{ + using RangeCoder; + + public class Encoder : ICoder, ISetCoderProperties, IWriteCoderProperties + { + enum EMatchFinderType + { + BT2, + BT4, + }; + + const UInt32 kIfinityPrice = 0xFFFFFFF; + + static Byte[] g_FastPos = new Byte[1 << 11]; + + static Encoder() + { + const Byte kFastSlots = 22; + int c = 2; + g_FastPos[0] = 0; + g_FastPos[1] = 1; + for (Byte slotFast = 2; slotFast < kFastSlots; slotFast++) + { + UInt32 k = ((UInt32)1 << ((slotFast >> 1) - 1)); + for (UInt32 j = 0; j < k; j++, c++) + g_FastPos[c] = slotFast; + } + } + + static UInt32 GetPosSlot(UInt32 pos) + { + if (pos < (1 << 11)) + return g_FastPos[pos]; + if (pos < (1 << 21)) + return (UInt32)(g_FastPos[pos >> 10] + 20); + return (UInt32)(g_FastPos[pos >> 20] + 40); + } + + static UInt32 GetPosSlot2(UInt32 pos) + { + if (pos < (1 << 17)) + return (UInt32)(g_FastPos[pos >> 6] + 12); + if (pos < (1 << 27)) + return (UInt32)(g_FastPos[pos >> 16] + 32); + return (UInt32)(g_FastPos[pos >> 26] + 52); + } + + Base.State _state = new Base.State(); + Byte _previousByte; + UInt32[] _repDistances = new UInt32[Base.kNumRepDistances]; + + void BaseInit() + { + _state.Init(); + _previousByte = 0; + for (UInt32 i = 0; i < Base.kNumRepDistances; i++) + _repDistances[i] = 0; + } + + const int kDefaultDictionaryLogSize = 22; + const UInt32 kNumFastBytesDefault = 0x20; + + class LiteralEncoder + { + public struct Encoder2 + { + BitEncoder[] m_Encoders; + + public void Create() { m_Encoders = new BitEncoder[0x300]; } + + public void Init() { for (int i = 0; i < 0x300; i++) m_Encoders[i].Init(); } + + public void Encode(RangeCoder.Encoder rangeEncoder, byte symbol) + { + uint context = 1; + for (int i = 7; i >= 0; i--) + { + uint bit = (uint)((symbol >> i) & 1); + m_Encoders[context].Encode(rangeEncoder, bit); + context = (context << 1) | bit; + } + } + + public void EncodeMatched(RangeCoder.Encoder rangeEncoder, byte matchByte, byte symbol) + { + uint context = 1; + bool same = true; + for (int i = 7; i >= 0; i--) + { + uint bit = (uint)((symbol >> i) & 1); + uint state = context; + if (same) + { + uint matchBit = (uint)((matchByte >> i) & 1); + state += ((1 + matchBit) << 8); + same = (matchBit == bit); + } + m_Encoders[state].Encode(rangeEncoder, bit); + context = (context << 1) | bit; + } + } + + public uint GetPrice(bool matchMode, byte matchByte, byte symbol) + { + uint price = 0; + uint context = 1; + int i = 7; + if (matchMode) + { + for (; i >= 0; i--) + { + uint matchBit = (uint)(matchByte >> i) & 1; + uint bit = (uint)(symbol >> i) & 1; + price += m_Encoders[((1 + matchBit) << 8) + context].GetPrice(bit); + context = (context << 1) | bit; + if (matchBit != bit) + { + i--; + break; + } + } + } + for (; i >= 0; i--) + { + uint bit = (uint)(symbol >> i) & 1; + price += m_Encoders[context].GetPrice(bit); + context = (context << 1) | bit; + } + return price; + } + } + + Encoder2[] m_Coders; + int m_NumPrevBits; + int m_NumPosBits; + uint m_PosMask; + + public void Create(int numPosBits, int numPrevBits) + { + if (m_Coders != null && m_NumPrevBits == numPrevBits && m_NumPosBits == numPosBits) + return; + m_NumPosBits = numPosBits; + m_PosMask = ((uint)1 << numPosBits) - 1; + m_NumPrevBits = numPrevBits; + uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits); + m_Coders = new Encoder2[numStates]; + for (uint i = 0; i < numStates; i++) + m_Coders[i].Create(); + } + + public void Init() + { + uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits); + for (uint i = 0; i < numStates; i++) + m_Coders[i].Init(); + } + + public Encoder2 GetSubCoder(UInt32 pos, Byte prevByte) + { return m_Coders[((pos & m_PosMask) << m_NumPrevBits) + (uint)(prevByte >> (8 - m_NumPrevBits))]; } + } + + class LenEncoder + { + RangeCoder.BitEncoder _choice = new RangeCoder.BitEncoder(); + RangeCoder.BitEncoder _choice2 = new RangeCoder.BitEncoder(); + RangeCoder.BitTreeEncoder[] _lowCoder = new RangeCoder.BitTreeEncoder[Base.kNumPosStatesEncodingMax]; + RangeCoder.BitTreeEncoder[] _midCoder = new RangeCoder.BitTreeEncoder[Base.kNumPosStatesEncodingMax]; + RangeCoder.BitTreeEncoder _highCoder = new RangeCoder.BitTreeEncoder(Base.kNumHighLenBits); + + public LenEncoder() + { + for (UInt32 posState = 0; posState < Base.kNumPosStatesEncodingMax; posState++) + { + _lowCoder[posState] = new RangeCoder.BitTreeEncoder(Base.kNumLowLenBits); + _midCoder[posState] = new RangeCoder.BitTreeEncoder(Base.kNumMidLenBits); + } + } + + public void Init(UInt32 numPosStates) + { + _choice.Init(); + _choice2.Init(); + for (UInt32 posState = 0; posState < numPosStates; posState++) + { + _lowCoder[posState].Init(); + _midCoder[posState].Init(); + } + _highCoder.Init(); + } + + public void Encode(RangeCoder.Encoder rangeEncoder, UInt32 symbol, UInt32 posState) + { + if (symbol < Base.kNumLowLenSymbols) + { + _choice.Encode(rangeEncoder, 0); + _lowCoder[posState].Encode(rangeEncoder, symbol); + } + else + { + symbol -= Base.kNumLowLenSymbols; + _choice.Encode(rangeEncoder, 1); + if (symbol < Base.kNumMidLenSymbols) + { + _choice2.Encode(rangeEncoder, 0); + _midCoder[posState].Encode(rangeEncoder, symbol); + } + else + { + _choice2.Encode(rangeEncoder, 1); + _highCoder.Encode(rangeEncoder, symbol - Base.kNumMidLenSymbols); + } + } + } + + public void SetPrices(UInt32 posState, UInt32 numSymbols, UInt32[] prices, UInt32 st) + { + UInt32 a0 = _choice.GetPrice0(); + UInt32 a1 = _choice.GetPrice1(); + UInt32 b0 = a1 + _choice2.GetPrice0(); + UInt32 b1 = a1 + _choice2.GetPrice1(); + UInt32 i = 0; + for (i = 0; i < Base.kNumLowLenSymbols; i++) + { + if (i >= numSymbols) + return; + prices[st + i] = a0 + _lowCoder[posState].GetPrice(i); + } + for (; i < Base.kNumLowLenSymbols + Base.kNumMidLenSymbols; i++) + { + if (i >= numSymbols) + return; + prices[st + i] = b0 + _midCoder[posState].GetPrice(i - Base.kNumLowLenSymbols); + } + for (; i < numSymbols; i++) + prices[st + i] = b1 + _highCoder.GetPrice(i - Base.kNumLowLenSymbols - Base.kNumMidLenSymbols); + } + }; + + const UInt32 kNumLenSpecSymbols = Base.kNumLowLenSymbols + Base.kNumMidLenSymbols; + + class LenPriceTableEncoder : LenEncoder + { + UInt32[] _prices = new UInt32[Base.kNumLenSymbols << Base.kNumPosStatesBitsEncodingMax]; + UInt32 _tableSize; + UInt32[] _counters = new UInt32[Base.kNumPosStatesEncodingMax]; + + public void SetTableSize(UInt32 tableSize) { _tableSize = tableSize; } + + public UInt32 GetPrice(UInt32 symbol, UInt32 posState) + { + return _prices[posState * Base.kNumLenSymbols + symbol]; + } + + void UpdateTable(UInt32 posState) + { + SetPrices(posState, _tableSize, _prices, posState * Base.kNumLenSymbols); + _counters[posState] = _tableSize; + } + + public void UpdateTables(UInt32 numPosStates) + { + for (UInt32 posState = 0; posState < numPosStates; posState++) + UpdateTable(posState); + } + + public new void Encode(RangeCoder.Encoder rangeEncoder, UInt32 symbol, UInt32 posState) + { + base.Encode(rangeEncoder, symbol, posState); + if (--_counters[posState] == 0) + UpdateTable(posState); + } + } + + const UInt32 kNumOpts = 1 << 12; + class Optimal + { + public Base.State State; + + public bool Prev1IsChar; + public bool Prev2; + + public UInt32 PosPrev2; + public UInt32 BackPrev2; + + public UInt32 Price; + public UInt32 PosPrev; + public UInt32 BackPrev; + + public UInt32 Backs0; + public UInt32 Backs1; + public UInt32 Backs2; + public UInt32 Backs3; + + public void MakeAsChar() { BackPrev = 0xFFFFFFFF; Prev1IsChar = false; } + public void MakeAsShortRep() { BackPrev = 0; ; Prev1IsChar = false; } + public bool IsShortRep() { return (BackPrev == 0); } + }; + Optimal[] _optimum = new Optimal[kNumOpts]; + LZ.IMatchFinder _matchFinder = null; + RangeCoder.Encoder _rangeEncoder = new RangeCoder.Encoder(); + + RangeCoder.BitEncoder[] _isMatch = new RangeCoder.BitEncoder[Base.kNumStates << Base.kNumPosStatesBitsMax]; + RangeCoder.BitEncoder[] _isRep = new RangeCoder.BitEncoder[Base.kNumStates]; + RangeCoder.BitEncoder[] _isRepG0 = new RangeCoder.BitEncoder[Base.kNumStates]; + RangeCoder.BitEncoder[] _isRepG1 = new RangeCoder.BitEncoder[Base.kNumStates]; + RangeCoder.BitEncoder[] _isRepG2 = new RangeCoder.BitEncoder[Base.kNumStates]; + RangeCoder.BitEncoder[] _isRep0Long = new RangeCoder.BitEncoder[Base.kNumStates << Base.kNumPosStatesBitsMax]; + + RangeCoder.BitTreeEncoder[] _posSlotEncoder = new RangeCoder.BitTreeEncoder[Base.kNumLenToPosStates]; + + RangeCoder.BitEncoder[] _posEncoders = new RangeCoder.BitEncoder[Base.kNumFullDistances - Base.kEndPosModelIndex]; + RangeCoder.BitTreeEncoder _posAlignEncoder = new RangeCoder.BitTreeEncoder(Base.kNumAlignBits); + + LenPriceTableEncoder _lenEncoder = new LenPriceTableEncoder(); + LenPriceTableEncoder _repMatchLenEncoder = new LenPriceTableEncoder(); + + LiteralEncoder _literalEncoder = new LiteralEncoder(); + + UInt32[] _matchDistances = new UInt32[Base.kMatchMaxLen * 2 + 2]; + + UInt32 _numFastBytes = kNumFastBytesDefault; + UInt32 _longestMatchLength; + UInt32 _numDistancePairs; + + UInt32 _additionalOffset; + + UInt32 _optimumEndIndex; + UInt32 _optimumCurrentIndex; + + bool _longestMatchWasFound; + + UInt32[] _posSlotPrices = new UInt32[1 << (Base.kNumPosSlotBits + Base.kNumLenToPosStatesBits)]; + UInt32[] _distancesPrices = new UInt32[Base.kNumFullDistances << Base.kNumLenToPosStatesBits]; + UInt32[] _alignPrices = new UInt32[Base.kAlignTableSize]; + UInt32 _alignPriceCount; + + UInt32 _distTableSize = (kDefaultDictionaryLogSize * 2); + + int _posStateBits = 2; + UInt32 _posStateMask = (4 - 1); + int _numLiteralPosStateBits = 0; + int _numLiteralContextBits = 3; + + UInt32 _dictionarySize = (1 << kDefaultDictionaryLogSize); + UInt32 _dictionarySizePrev = 0xFFFFFFFF; + UInt32 _numFastBytesPrev = 0xFFFFFFFF; + + Int64 nowPos64; + bool _finished; + System.IO.Stream _inStream; + + EMatchFinderType _matchFinderType = EMatchFinderType.BT4; + bool _writeEndMark = false; + + bool _needReleaseMFStream; + + void Create() + { + if (_matchFinder == null) + { + LZ.BinTree bt = new LZ.BinTree(); + int numHashBytes = 4; + if (_matchFinderType == EMatchFinderType.BT2) + numHashBytes = 2; + bt.SetType(numHashBytes); + _matchFinder = bt; + } + _literalEncoder.Create(_numLiteralPosStateBits, _numLiteralContextBits); + + if (_dictionarySize == _dictionarySizePrev && _numFastBytesPrev == _numFastBytes) + return; + _matchFinder.Create(_dictionarySize, kNumOpts, _numFastBytes, Base.kMatchMaxLen + 1); + _dictionarySizePrev = _dictionarySize; + _numFastBytesPrev = _numFastBytes; + } + + public Encoder() + { + for (int i = 0; i < kNumOpts; i++) + _optimum[i] = new Optimal(); + for (int i = 0; i < Base.kNumLenToPosStates; i++) + _posSlotEncoder[i] = new RangeCoder.BitTreeEncoder(Base.kNumPosSlotBits); + } + + void SetWriteEndMarkerMode(bool writeEndMarker) + { + _writeEndMark = writeEndMarker; + } + + void Init() + { + BaseInit(); + _rangeEncoder.Init(); + + uint i; + for (i = 0; i < Base.kNumStates; i++) + { + for (uint j = 0; j <= _posStateMask; j++) + { + uint complexState = (i << Base.kNumPosStatesBitsMax) + j; + _isMatch[complexState].Init(); + _isRep0Long[complexState].Init(); + } + _isRep[i].Init(); + _isRepG0[i].Init(); + _isRepG1[i].Init(); + _isRepG2[i].Init(); + } + _literalEncoder.Init(); + for (i = 0; i < Base.kNumLenToPosStates; i++) + _posSlotEncoder[i].Init(); + for (i = 0; i < Base.kNumFullDistances - Base.kEndPosModelIndex; i++) + _posEncoders[i].Init(); + + _lenEncoder.Init((UInt32)1 << _posStateBits); + _repMatchLenEncoder.Init((UInt32)1 << _posStateBits); + + _posAlignEncoder.Init(); + + _longestMatchWasFound = false; + _optimumEndIndex = 0; + _optimumCurrentIndex = 0; + _additionalOffset = 0; + } + + void ReadMatchDistances(out UInt32 lenRes, out UInt32 numDistancePairs) + { + lenRes = 0; + numDistancePairs = _matchFinder.GetMatches(_matchDistances); + if (numDistancePairs > 0) + { + lenRes = _matchDistances[numDistancePairs - 2]; + if (lenRes == _numFastBytes) + lenRes += _matchFinder.GetMatchLen((int)lenRes - 1, _matchDistances[numDistancePairs - 1], + Base.kMatchMaxLen - lenRes); + } + _additionalOffset++; + } + + + void MovePos(UInt32 num) + { + if (num > 0) + { + _matchFinder.Skip(num); + _additionalOffset += num; + } + } + + UInt32 GetRepLen1Price(Base.State state, UInt32 posState) + { + return _isRepG0[state.Index].GetPrice0() + + _isRep0Long[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice0(); + } + + UInt32 GetPureRepPrice(UInt32 repIndex, Base.State state, UInt32 posState) + { + UInt32 price; + if (repIndex == 0) + { + price = _isRepG0[state.Index].GetPrice0(); + price += _isRep0Long[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice1(); + } + else + { + price = _isRepG0[state.Index].GetPrice1(); + if (repIndex == 1) + price += _isRepG1[state.Index].GetPrice0(); + else + { + price += _isRepG1[state.Index].GetPrice1(); + price += _isRepG2[state.Index].GetPrice(repIndex - 2); + } + } + return price; + } + + UInt32 GetRepPrice(UInt32 repIndex, UInt32 len, Base.State state, UInt32 posState) + { + UInt32 price = _repMatchLenEncoder.GetPrice(len - Base.kMatchMinLen, posState); + return price + GetPureRepPrice(repIndex, state, posState); + } + + UInt32 GetPosLenPrice(UInt32 pos, UInt32 len, UInt32 posState) + { + UInt32 price; + UInt32 lenToPosState = Base.GetLenToPosState(len); + if (pos < Base.kNumFullDistances) + price = _distancesPrices[(lenToPosState * Base.kNumFullDistances) + pos]; + else + price = _posSlotPrices[(lenToPosState << Base.kNumPosSlotBits) + GetPosSlot2(pos)] + + _alignPrices[pos & Base.kAlignMask]; + return price + _lenEncoder.GetPrice(len - Base.kMatchMinLen, posState); + } + + UInt32 Backward(out UInt32 backRes, UInt32 cur) + { + _optimumEndIndex = cur; + UInt32 posMem = _optimum[cur].PosPrev; + UInt32 backMem = _optimum[cur].BackPrev; + do + { + if (_optimum[cur].Prev1IsChar) + { + _optimum[posMem].MakeAsChar(); + _optimum[posMem].PosPrev = posMem - 1; + if (_optimum[cur].Prev2) + { + _optimum[posMem - 1].Prev1IsChar = false; + _optimum[posMem - 1].PosPrev = _optimum[cur].PosPrev2; + _optimum[posMem - 1].BackPrev = _optimum[cur].BackPrev2; + } + } + UInt32 posPrev = posMem; + UInt32 backCur = backMem; + + backMem = _optimum[posPrev].BackPrev; + posMem = _optimum[posPrev].PosPrev; + + _optimum[posPrev].BackPrev = backCur; + _optimum[posPrev].PosPrev = cur; + cur = posPrev; + } + while (cur > 0); + backRes = _optimum[0].BackPrev; + _optimumCurrentIndex = _optimum[0].PosPrev; + return _optimumCurrentIndex; + } + + UInt32[] reps = new UInt32[Base.kNumRepDistances]; + UInt32[] repLens = new UInt32[Base.kNumRepDistances]; + + + UInt32 GetOptimum(UInt32 position, out UInt32 backRes) + { + if (_optimumEndIndex != _optimumCurrentIndex) + { + UInt32 lenRes = _optimum[_optimumCurrentIndex].PosPrev - _optimumCurrentIndex; + backRes = _optimum[_optimumCurrentIndex].BackPrev; + _optimumCurrentIndex = _optimum[_optimumCurrentIndex].PosPrev; + return lenRes; + } + _optimumCurrentIndex = _optimumEndIndex = 0; + + UInt32 lenMain, numDistancePairs; + if (!_longestMatchWasFound) + { + ReadMatchDistances(out lenMain, out numDistancePairs); + } + else + { + lenMain = _longestMatchLength; + numDistancePairs = _numDistancePairs; + _longestMatchWasFound = false; + } + + UInt32 numAvailableBytes = _matchFinder.GetNumAvailableBytes() + 1; + if (numAvailableBytes < 2) + { + backRes = 0xFFFFFFFF; + return 1; + } + if (numAvailableBytes > Base.kMatchMaxLen) + numAvailableBytes = Base.kMatchMaxLen; + + UInt32 repMaxIndex = 0; + UInt32 i; + for (i = 0; i < Base.kNumRepDistances; i++) + { + reps[i] = _repDistances[i]; + repLens[i] = _matchFinder.GetMatchLen(0 - 1, reps[i], Base.kMatchMaxLen); + if (repLens[i] > repLens[repMaxIndex]) + repMaxIndex = i; + } + if (repLens[repMaxIndex] >= _numFastBytes) + { + backRes = repMaxIndex; + UInt32 lenRes = repLens[repMaxIndex]; + MovePos(lenRes - 1); + return lenRes; + } + + if (lenMain >= _numFastBytes) + { + backRes = _matchDistances[numDistancePairs - 1] + Base.kNumRepDistances; + MovePos(lenMain - 1); + return lenMain; + } + + Byte currentByte = _matchFinder.GetIndexByte(0 - 1); + Byte matchByte = _matchFinder.GetIndexByte((Int32)(0 - _repDistances[0] - 1 - 1)); + + if (lenMain < 2 && currentByte != matchByte && repLens[repMaxIndex] < 2) + { + backRes = (UInt32)0xFFFFFFFF; + return 1; + } + + _optimum[0].State = _state; + + UInt32 posState = (position & _posStateMask); + + _optimum[1].Price = _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice0() + + _literalEncoder.GetSubCoder(position, _previousByte).GetPrice(!_state.IsCharState(), matchByte, currentByte); + _optimum[1].MakeAsChar(); + + UInt32 matchPrice = _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice1(); + UInt32 repMatchPrice = matchPrice + _isRep[_state.Index].GetPrice1(); + + if (matchByte == currentByte) + { + UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(_state, posState); + if (shortRepPrice < _optimum[1].Price) + { + _optimum[1].Price = shortRepPrice; + _optimum[1].MakeAsShortRep(); + } + } + + UInt32 lenEnd = ((lenMain >= repLens[repMaxIndex]) ? lenMain : repLens[repMaxIndex]); + + if(lenEnd < 2) + { + backRes = _optimum[1].BackPrev; + return 1; + } + + _optimum[1].PosPrev = 0; + + _optimum[0].Backs0 = reps[0]; + _optimum[0].Backs1 = reps[1]; + _optimum[0].Backs2 = reps[2]; + _optimum[0].Backs3 = reps[3]; + + UInt32 len = lenEnd; + do + _optimum[len--].Price = kIfinityPrice; + while (len >= 2); + + for (i = 0; i < Base.kNumRepDistances; i++) + { + UInt32 repLen = repLens[i]; + if (repLen < 2) + continue; + UInt32 price = repMatchPrice + GetPureRepPrice(i, _state, posState); + do + { + UInt32 curAndLenPrice = price + _repMatchLenEncoder.GetPrice(repLen - 2, posState); + Optimal optimum = _optimum[repLen]; + if (curAndLenPrice < optimum.Price) + { + optimum.Price = curAndLenPrice; + optimum.PosPrev = 0; + optimum.BackPrev = i; + optimum.Prev1IsChar = false; + } + } + while (--repLen >= 2); + } + + UInt32 normalMatchPrice = matchPrice + _isRep[_state.Index].GetPrice0(); + + len = ((repLens[0] >= 2) ? repLens[0] + 1 : 2); + if (len <= lenMain) + { + UInt32 offs = 0; + while (len > _matchDistances[offs]) + offs += 2; + for (; ; len++) + { + UInt32 distance = _matchDistances[offs + 1]; + UInt32 curAndLenPrice = normalMatchPrice + GetPosLenPrice(distance, len, posState); + Optimal optimum = _optimum[len]; + if (curAndLenPrice < optimum.Price) + { + optimum.Price = curAndLenPrice; + optimum.PosPrev = 0; + optimum.BackPrev = distance + Base.kNumRepDistances; + optimum.Prev1IsChar = false; + } + if (len == _matchDistances[offs]) + { + offs += 2; + if (offs == numDistancePairs) + break; + } + } + } + + UInt32 cur = 0; + + while (true) + { + cur++; + if (cur == lenEnd) + return Backward(out backRes, cur); + UInt32 newLen; + ReadMatchDistances(out newLen, out numDistancePairs); + if (newLen >= _numFastBytes) + { + _numDistancePairs = numDistancePairs; + _longestMatchLength = newLen; + _longestMatchWasFound = true; + return Backward(out backRes, cur); + } + position++; + UInt32 posPrev = _optimum[cur].PosPrev; + Base.State state; + if (_optimum[cur].Prev1IsChar) + { + posPrev--; + if (_optimum[cur].Prev2) + { + state = _optimum[_optimum[cur].PosPrev2].State; + if (_optimum[cur].BackPrev2 < Base.kNumRepDistances) + state.UpdateRep(); + else + state.UpdateMatch(); + } + else + state = _optimum[posPrev].State; + state.UpdateChar(); + } + else + state = _optimum[posPrev].State; + if (posPrev == cur - 1) + { + if (_optimum[cur].IsShortRep()) + state.UpdateShortRep(); + else + state.UpdateChar(); + } + else + { + UInt32 pos; + if (_optimum[cur].Prev1IsChar && _optimum[cur].Prev2) + { + posPrev = _optimum[cur].PosPrev2; + pos = _optimum[cur].BackPrev2; + state.UpdateRep(); + } + else + { + pos = _optimum[cur].BackPrev; + if (pos < Base.kNumRepDistances) + state.UpdateRep(); + else + state.UpdateMatch(); + } + Optimal opt = _optimum[posPrev]; + if (pos < Base.kNumRepDistances) + { + if (pos == 0) + { + reps[0] = opt.Backs0; + reps[1] = opt.Backs1; + reps[2] = opt.Backs2; + reps[3] = opt.Backs3; + } + else if (pos == 1) + { + reps[0] = opt.Backs1; + reps[1] = opt.Backs0; + reps[2] = opt.Backs2; + reps[3] = opt.Backs3; + } + else if (pos == 2) + { + reps[0] = opt.Backs2; + reps[1] = opt.Backs0; + reps[2] = opt.Backs1; + reps[3] = opt.Backs3; + } + else + { + reps[0] = opt.Backs3; + reps[1] = opt.Backs0; + reps[2] = opt.Backs1; + reps[3] = opt.Backs2; + } + } + else + { + reps[0] = (pos - Base.kNumRepDistances); + reps[1] = opt.Backs0; + reps[2] = opt.Backs1; + reps[3] = opt.Backs2; + } + } + _optimum[cur].State = state; + _optimum[cur].Backs0 = reps[0]; + _optimum[cur].Backs1 = reps[1]; + _optimum[cur].Backs2 = reps[2]; + _optimum[cur].Backs3 = reps[3]; + UInt32 curPrice = _optimum[cur].Price; + + currentByte = _matchFinder.GetIndexByte(0 - 1); + matchByte = _matchFinder.GetIndexByte((Int32)(0 - reps[0] - 1 - 1)); + + posState = (position & _posStateMask); + + UInt32 curAnd1Price = curPrice + + _isMatch[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice0() + + _literalEncoder.GetSubCoder(position, _matchFinder.GetIndexByte(0 - 2)). + GetPrice(!state.IsCharState(), matchByte, currentByte); + + Optimal nextOptimum = _optimum[cur + 1]; + + bool nextIsChar = false; + if (curAnd1Price < nextOptimum.Price) + { + nextOptimum.Price = curAnd1Price; + nextOptimum.PosPrev = cur; + nextOptimum.MakeAsChar(); + nextIsChar = true; + } + + matchPrice = curPrice + _isMatch[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice1(); + repMatchPrice = matchPrice + _isRep[state.Index].GetPrice1(); + + if (matchByte == currentByte && + !(nextOptimum.PosPrev < cur && nextOptimum.BackPrev == 0)) + { + UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(state, posState); + if (shortRepPrice <= nextOptimum.Price) + { + nextOptimum.Price = shortRepPrice; + nextOptimum.PosPrev = cur; + nextOptimum.MakeAsShortRep(); + nextIsChar = true; + } + } + + UInt32 numAvailableBytesFull = _matchFinder.GetNumAvailableBytes() + 1; + numAvailableBytesFull = Math.Min(kNumOpts - 1 - cur, numAvailableBytesFull); + numAvailableBytes = numAvailableBytesFull; + + if (numAvailableBytes < 2) + continue; + if (numAvailableBytes > _numFastBytes) + numAvailableBytes = _numFastBytes; + if (!nextIsChar && matchByte != currentByte) + { + // try Literal + rep0 + UInt32 t = Math.Min(numAvailableBytesFull - 1, _numFastBytes); + UInt32 lenTest2 = _matchFinder.GetMatchLen(0, reps[0], t); + if (lenTest2 >= 2) + { + Base.State state2 = state; + state2.UpdateChar(); + UInt32 posStateNext = (position + 1) & _posStateMask; + UInt32 nextRepMatchPrice = curAnd1Price + + _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice1() + + _isRep[state2.Index].GetPrice1(); + { + UInt32 offset = cur + 1 + lenTest2; + while (lenEnd < offset) + _optimum[++lenEnd].Price = kIfinityPrice; + UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice( + 0, lenTest2, state2, posStateNext); + Optimal optimum = _optimum[offset]; + if (curAndLenPrice < optimum.Price) + { + optimum.Price = curAndLenPrice; + optimum.PosPrev = cur + 1; + optimum.BackPrev = 0; + optimum.Prev1IsChar = true; + optimum.Prev2 = false; + } + } + } + } + + UInt32 startLen = 2; // speed optimization + + for (UInt32 repIndex = 0; repIndex < Base.kNumRepDistances; repIndex++) + { + UInt32 lenTest = _matchFinder.GetMatchLen(0 - 1, reps[repIndex], numAvailableBytes); + if (lenTest < 2) + continue; + UInt32 lenTestTemp = lenTest; + do + { + while (lenEnd < cur + lenTest) + _optimum[++lenEnd].Price = kIfinityPrice; + UInt32 curAndLenPrice = repMatchPrice + GetRepPrice(repIndex, lenTest, state, posState); + Optimal optimum = _optimum[cur + lenTest]; + if (curAndLenPrice < optimum.Price) + { + optimum.Price = curAndLenPrice; + optimum.PosPrev = cur; + optimum.BackPrev = repIndex; + optimum.Prev1IsChar = false; + } + } + while(--lenTest >= 2); + lenTest = lenTestTemp; + + if (repIndex == 0) + startLen = lenTest + 1; + + // if (_maxMode) + if (lenTest < numAvailableBytesFull) + { + UInt32 t = Math.Min(numAvailableBytesFull - 1 - lenTest, _numFastBytes); + UInt32 lenTest2 = _matchFinder.GetMatchLen((Int32)lenTest, reps[repIndex], t); + if (lenTest2 >= 2) + { + Base.State state2 = state; + state2.UpdateRep(); + UInt32 posStateNext = (position + lenTest) & _posStateMask; + UInt32 curAndLenCharPrice = + repMatchPrice + GetRepPrice(repIndex, lenTest, state, posState) + + _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice0() + + _literalEncoder.GetSubCoder(position + lenTest, + _matchFinder.GetIndexByte((Int32)lenTest - 1 - 1)).GetPrice(true, + _matchFinder.GetIndexByte((Int32)((Int32)lenTest - 1 - (Int32)(reps[repIndex] + 1))), + _matchFinder.GetIndexByte((Int32)lenTest - 1)); + state2.UpdateChar(); + posStateNext = (position + lenTest + 1) & _posStateMask; + UInt32 nextMatchPrice = curAndLenCharPrice + _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice1(); + UInt32 nextRepMatchPrice = nextMatchPrice + _isRep[state2.Index].GetPrice1(); + + // for(; lenTest2 >= 2; lenTest2--) + { + UInt32 offset = lenTest + 1 + lenTest2; + while(lenEnd < cur + offset) + _optimum[++lenEnd].Price = kIfinityPrice; + UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice(0, lenTest2, state2, posStateNext); + Optimal optimum = _optimum[cur + offset]; + if (curAndLenPrice < optimum.Price) + { + optimum.Price = curAndLenPrice; + optimum.PosPrev = cur + lenTest + 1; + optimum.BackPrev = 0; + optimum.Prev1IsChar = true; + optimum.Prev2 = true; + optimum.PosPrev2 = cur; + optimum.BackPrev2 = repIndex; + } + } + } + } + } + + if (newLen > numAvailableBytes) + { + newLen = numAvailableBytes; + for (numDistancePairs = 0; newLen > _matchDistances[numDistancePairs]; numDistancePairs += 2) ; + _matchDistances[numDistancePairs] = newLen; + numDistancePairs += 2; + } + if (newLen >= startLen) + { + normalMatchPrice = matchPrice + _isRep[state.Index].GetPrice0(); + while (lenEnd < cur + newLen) + _optimum[++lenEnd].Price = kIfinityPrice; + + UInt32 offs = 0; + while (startLen > _matchDistances[offs]) + offs += 2; + + for (UInt32 lenTest = startLen; ; lenTest++) + { + UInt32 curBack = _matchDistances[offs + 1]; + UInt32 curAndLenPrice = normalMatchPrice + GetPosLenPrice(curBack, lenTest, posState); + Optimal optimum = _optimum[cur + lenTest]; + if (curAndLenPrice < optimum.Price) + { + optimum.Price = curAndLenPrice; + optimum.PosPrev = cur; + optimum.BackPrev = curBack + Base.kNumRepDistances; + optimum.Prev1IsChar = false; + } + + if (lenTest == _matchDistances[offs]) + { + if (lenTest < numAvailableBytesFull) + { + UInt32 t = Math.Min(numAvailableBytesFull - 1 - lenTest, _numFastBytes); + UInt32 lenTest2 = _matchFinder.GetMatchLen((Int32)lenTest, curBack, t); + if (lenTest2 >= 2) + { + Base.State state2 = state; + state2.UpdateMatch(); + UInt32 posStateNext = (position + lenTest) & _posStateMask; + UInt32 curAndLenCharPrice = curAndLenPrice + + _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice0() + + _literalEncoder.GetSubCoder(position + lenTest, + _matchFinder.GetIndexByte((Int32)lenTest - 1 - 1)). + GetPrice(true, + _matchFinder.GetIndexByte((Int32)lenTest - (Int32)(curBack + 1) - 1), + _matchFinder.GetIndexByte((Int32)lenTest - 1)); + state2.UpdateChar(); + posStateNext = (position + lenTest + 1) & _posStateMask; + UInt32 nextMatchPrice = curAndLenCharPrice + _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice1(); + UInt32 nextRepMatchPrice = nextMatchPrice + _isRep[state2.Index].GetPrice1(); + + UInt32 offset = lenTest + 1 + lenTest2; + while (lenEnd < cur + offset) + _optimum[++lenEnd].Price = kIfinityPrice; + curAndLenPrice = nextRepMatchPrice + GetRepPrice(0, lenTest2, state2, posStateNext); + optimum = _optimum[cur + offset]; + if (curAndLenPrice < optimum.Price) + { + optimum.Price = curAndLenPrice; + optimum.PosPrev = cur + lenTest + 1; + optimum.BackPrev = 0; + optimum.Prev1IsChar = true; + optimum.Prev2 = true; + optimum.PosPrev2 = cur; + optimum.BackPrev2 = curBack + Base.kNumRepDistances; + } + } + } + offs += 2; + if (offs == numDistancePairs) + break; + } + } + } + } + } + + bool ChangePair(UInt32 smallDist, UInt32 bigDist) + { + const int kDif = 7; + return (smallDist < ((UInt32)(1) << (32 - kDif)) && bigDist >= (smallDist << kDif)); + } + + void WriteEndMarker(UInt32 posState) + { + if (!_writeEndMark) + return; + + _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].Encode(_rangeEncoder, 1); + _isRep[_state.Index].Encode(_rangeEncoder, 0); + _state.UpdateMatch(); + UInt32 len = Base.kMatchMinLen; + _lenEncoder.Encode(_rangeEncoder, len - Base.kMatchMinLen, posState); + UInt32 posSlot = (1 << Base.kNumPosSlotBits) - 1; + UInt32 lenToPosState = Base.GetLenToPosState(len); + _posSlotEncoder[lenToPosState].Encode(_rangeEncoder, posSlot); + int footerBits = 30; + UInt32 posReduced = (((UInt32)1) << footerBits) - 1; + _rangeEncoder.EncodeDirectBits(posReduced >> Base.kNumAlignBits, footerBits - Base.kNumAlignBits); + _posAlignEncoder.ReverseEncode(_rangeEncoder, posReduced & Base.kAlignMask); + } + + void Flush(UInt32 nowPos) + { + ReleaseMFStream(); + WriteEndMarker(nowPos & _posStateMask); + _rangeEncoder.FlushData(); + _rangeEncoder.FlushStream(); + } + + public void CodeOneBlock(out Int64 inSize, out Int64 outSize, out bool finished) + { + inSize = 0; + outSize = 0; + finished = true; + + if (_inStream != null) + { + _matchFinder.SetStream(_inStream); + _matchFinder.Init(); + _needReleaseMFStream = true; + _inStream = null; + if (_trainSize > 0) + _matchFinder.Skip(_trainSize); + } + + if (_finished) + return; + _finished = true; + + + Int64 progressPosValuePrev = nowPos64; + if (nowPos64 == 0) + { + if (_matchFinder.GetNumAvailableBytes() == 0) + { + Flush((UInt32)nowPos64); + return; + } + UInt32 len, numDistancePairs; // it's not used + ReadMatchDistances(out len, out numDistancePairs); + UInt32 posState = (UInt32)(nowPos64) & _posStateMask; + _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].Encode(_rangeEncoder, 0); + _state.UpdateChar(); + Byte curByte = _matchFinder.GetIndexByte((Int32)(0 - _additionalOffset)); + _literalEncoder.GetSubCoder((UInt32)(nowPos64), _previousByte).Encode(_rangeEncoder, curByte); + _previousByte = curByte; + _additionalOffset--; + nowPos64++; + } + if (_matchFinder.GetNumAvailableBytes() == 0) + { + Flush((UInt32)nowPos64); + return; + } + while (true) + { + UInt32 pos; + UInt32 len = GetOptimum((UInt32)nowPos64, out pos); + + UInt32 posState = ((UInt32)nowPos64) & _posStateMask; + UInt32 complexState = (_state.Index << Base.kNumPosStatesBitsMax) + posState; + if (len == 1 && pos == 0xFFFFFFFF) + { + _isMatch[complexState].Encode(_rangeEncoder, 0); + Byte curByte = _matchFinder.GetIndexByte((Int32)(0 - _additionalOffset)); + LiteralEncoder.Encoder2 subCoder = _literalEncoder.GetSubCoder((UInt32)nowPos64, _previousByte); + if (!_state.IsCharState()) + { + Byte matchByte = _matchFinder.GetIndexByte((Int32)(0 - _repDistances[0] - 1 - _additionalOffset)); + subCoder.EncodeMatched(_rangeEncoder, matchByte, curByte); + } + else + subCoder.Encode(_rangeEncoder, curByte); + _previousByte = curByte; + _state.UpdateChar(); + } + else + { + _isMatch[complexState].Encode(_rangeEncoder, 1); + if (pos < Base.kNumRepDistances) + { + _isRep[_state.Index].Encode(_rangeEncoder, 1); + if (pos == 0) + { + _isRepG0[_state.Index].Encode(_rangeEncoder, 0); + if (len == 1) + _isRep0Long[complexState].Encode(_rangeEncoder, 0); + else + _isRep0Long[complexState].Encode(_rangeEncoder, 1); + } + else + { + _isRepG0[_state.Index].Encode(_rangeEncoder, 1); + if (pos == 1) + _isRepG1[_state.Index].Encode(_rangeEncoder, 0); + else + { + _isRepG1[_state.Index].Encode(_rangeEncoder, 1); + _isRepG2[_state.Index].Encode(_rangeEncoder, pos - 2); + } + } + if (len == 1) + _state.UpdateShortRep(); + else + { + _repMatchLenEncoder.Encode(_rangeEncoder, len - Base.kMatchMinLen, posState); + _state.UpdateRep(); + } + UInt32 distance = _repDistances[pos]; + if (pos != 0) + { + for (UInt32 i = pos; i >= 1; i--) + _repDistances[i] = _repDistances[i - 1]; + _repDistances[0] = distance; + } + } + else + { + _isRep[_state.Index].Encode(_rangeEncoder, 0); + _state.UpdateMatch(); + _lenEncoder.Encode(_rangeEncoder, len - Base.kMatchMinLen, posState); + pos -= Base.kNumRepDistances; + UInt32 posSlot = GetPosSlot(pos); + UInt32 lenToPosState = Base.GetLenToPosState(len); + _posSlotEncoder[lenToPosState].Encode(_rangeEncoder, posSlot); + + if (posSlot >= Base.kStartPosModelIndex) + { + int footerBits = (int)((posSlot >> 1) - 1); + UInt32 baseVal = ((2 | (posSlot & 1)) << footerBits); + UInt32 posReduced = pos - baseVal; + + if (posSlot < Base.kEndPosModelIndex) + RangeCoder.BitTreeEncoder.ReverseEncode(_posEncoders, + baseVal - posSlot - 1, _rangeEncoder, footerBits, posReduced); + else + { + _rangeEncoder.EncodeDirectBits(posReduced >> Base.kNumAlignBits, footerBits - Base.kNumAlignBits); + _posAlignEncoder.ReverseEncode(_rangeEncoder, posReduced & Base.kAlignMask); + _alignPriceCount++; + } + } + UInt32 distance = pos; + for (UInt32 i = Base.kNumRepDistances - 1; i >= 1; i--) + _repDistances[i] = _repDistances[i - 1]; + _repDistances[0] = distance; + _matchPriceCount++; + } + _previousByte = _matchFinder.GetIndexByte((Int32)(len - 1 - _additionalOffset)); + } + _additionalOffset -= len; + nowPos64 += len; + if (_additionalOffset == 0) + { + // if (!_fastMode) + if (_matchPriceCount >= (1 << 7)) + FillDistancesPrices(); + if (_alignPriceCount >= Base.kAlignTableSize) + FillAlignPrices(); + inSize = nowPos64; + outSize = _rangeEncoder.GetProcessedSizeAdd(); + if (_matchFinder.GetNumAvailableBytes() == 0) + { + Flush((UInt32)nowPos64); + return; + } + + if (nowPos64 - progressPosValuePrev >= (1 << 12)) + { + _finished = false; + finished = false; + return; + } + } + } + } + + void ReleaseMFStream() + { + if (_matchFinder != null && _needReleaseMFStream) + { + _matchFinder.ReleaseStream(); + _needReleaseMFStream = false; + } + } + + void SetOutStream(System.IO.Stream outStream) { _rangeEncoder.SetStream(outStream); } + void ReleaseOutStream() { _rangeEncoder.ReleaseStream(); } + + void ReleaseStreams() + { + ReleaseMFStream(); + ReleaseOutStream(); + } + + void SetStreams(System.IO.Stream inStream, System.IO.Stream outStream, + Int64 inSize, Int64 outSize) + { + _inStream = inStream; + _finished = false; + Create(); + SetOutStream(outStream); + Init(); + + // if (!_fastMode) + { + FillDistancesPrices(); + FillAlignPrices(); + } + + _lenEncoder.SetTableSize(_numFastBytes + 1 - Base.kMatchMinLen); + _lenEncoder.UpdateTables((UInt32)1 << _posStateBits); + _repMatchLenEncoder.SetTableSize(_numFastBytes + 1 - Base.kMatchMinLen); + _repMatchLenEncoder.UpdateTables((UInt32)1 << _posStateBits); + + nowPos64 = 0; + } + + + public void Code(System.IO.Stream inStream, System.IO.Stream outStream, + Int64 inSize, Int64 outSize, ICodeProgress progress) + { + _needReleaseMFStream = false; + try + { + SetStreams(inStream, outStream, inSize, outSize); + while (true) + { + Int64 processedInSize; + Int64 processedOutSize; + bool finished; + CodeOneBlock(out processedInSize, out processedOutSize, out finished); + if (finished) + return; + if (progress != null) + { + progress.SetProgress(processedInSize, processedOutSize); + } + } + } + finally + { + ReleaseStreams(); + } + } + + const int kPropSize = 5; + Byte[] properties = new Byte[kPropSize]; + + public void WriteCoderProperties(System.IO.Stream outStream) + { + properties[0] = (Byte)((_posStateBits * 5 + _numLiteralPosStateBits) * 9 + _numLiteralContextBits); + for (int i = 0; i < 4; i++) + properties[1 + i] = (Byte)((_dictionarySize >> (8 * i)) & 0xFF); + outStream.Write(properties, 0, kPropSize); + } + + UInt32[] tempPrices = new UInt32[Base.kNumFullDistances]; + UInt32 _matchPriceCount; + + void FillDistancesPrices() + { + for (UInt32 i = Base.kStartPosModelIndex; i < Base.kNumFullDistances; i++) + { + UInt32 posSlot = GetPosSlot(i); + int footerBits = (int)((posSlot >> 1) - 1); + UInt32 baseVal = ((2 | (posSlot & 1)) << footerBits); + tempPrices[i] = BitTreeEncoder.ReverseGetPrice(_posEncoders, + baseVal - posSlot - 1, footerBits, i - baseVal); + } + + for (UInt32 lenToPosState = 0; lenToPosState < Base.kNumLenToPosStates; lenToPosState++) + { + UInt32 posSlot; + RangeCoder.BitTreeEncoder encoder = _posSlotEncoder[lenToPosState]; + + UInt32 st = (lenToPosState << Base.kNumPosSlotBits); + for (posSlot = 0; posSlot < _distTableSize; posSlot++) + _posSlotPrices[st + posSlot] = encoder.GetPrice(posSlot); + for (posSlot = Base.kEndPosModelIndex; posSlot < _distTableSize; posSlot++) + _posSlotPrices[st + posSlot] += ((((posSlot >> 1) - 1) - Base.kNumAlignBits) << RangeCoder.BitEncoder.kNumBitPriceShiftBits); + + UInt32 st2 = lenToPosState * Base.kNumFullDistances; + UInt32 i; + for (i = 0; i < Base.kStartPosModelIndex; i++) + _distancesPrices[st2 + i] = _posSlotPrices[st + i]; + for (; i < Base.kNumFullDistances; i++) + _distancesPrices[st2 + i] = _posSlotPrices[st + GetPosSlot(i)] + tempPrices[i]; + } + _matchPriceCount = 0; + } + + void FillAlignPrices() + { + for (UInt32 i = 0; i < Base.kAlignTableSize; i++) + _alignPrices[i] = _posAlignEncoder.ReverseGetPrice(i); + _alignPriceCount = 0; + } + + + static string[] kMatchFinderIDs = + { + "BT2", + "BT4", + }; + + static int FindMatchFinder(string s) + { + for (int m = 0; m < kMatchFinderIDs.Length; m++) + if (s == kMatchFinderIDs[m]) + return m; + return -1; + } + + public void SetCoderProperties(CoderPropID[] propIDs, object[] properties) + { + for (UInt32 i = 0; i < properties.Length; i++) + { + object prop = properties[i]; + switch (propIDs[i]) + { + case CoderPropID.NumFastBytes: + { + if (!(prop is Int32)) + throw new InvalidParamException(); + Int32 numFastBytes = (Int32)prop; + if (numFastBytes < 5 || numFastBytes > Base.kMatchMaxLen) + throw new InvalidParamException(); + _numFastBytes = (UInt32)numFastBytes; + break; + } + case CoderPropID.Algorithm: + { + /* + if (!(prop is Int32)) + throw new InvalidParamException(); + Int32 maximize = (Int32)prop; + _fastMode = (maximize == 0); + _maxMode = (maximize >= 2); + */ + break; + } + case CoderPropID.MatchFinder: + { + if (!(prop is String)) + throw new InvalidParamException(); + EMatchFinderType matchFinderIndexPrev = _matchFinderType; + int m = FindMatchFinder(((string)prop).ToUpper()); + if (m < 0) + throw new InvalidParamException(); + _matchFinderType = (EMatchFinderType)m; + if (_matchFinder != null && matchFinderIndexPrev != _matchFinderType) + { + _dictionarySizePrev = 0xFFFFFFFF; + _matchFinder = null; + } + break; + } + case CoderPropID.DictionarySize: + { + const int kDicLogSizeMaxCompress = 30; + if (!(prop is Int32)) + throw new InvalidParamException(); ; + Int32 dictionarySize = (Int32)prop; + if (dictionarySize < (UInt32)(1 << Base.kDicLogSizeMin) || + dictionarySize > (UInt32)(1 << kDicLogSizeMaxCompress)) + throw new InvalidParamException(); + _dictionarySize = (UInt32)dictionarySize; + int dicLogSize; + for (dicLogSize = 0; dicLogSize < (UInt32)kDicLogSizeMaxCompress; dicLogSize++) + if (dictionarySize <= ((UInt32)(1) << dicLogSize)) + break; + _distTableSize = (UInt32)dicLogSize * 2; + break; + } + case CoderPropID.PosStateBits: + { + if (!(prop is Int32)) + throw new InvalidParamException(); + Int32 v = (Int32)prop; + if (v < 0 || v > (UInt32)Base.kNumPosStatesBitsEncodingMax) + throw new InvalidParamException(); + _posStateBits = (int)v; + _posStateMask = (((UInt32)1) << (int)_posStateBits) - 1; + break; + } + case CoderPropID.LitPosBits: + { + if (!(prop is Int32)) + throw new InvalidParamException(); + Int32 v = (Int32)prop; + if (v < 0 || v > (UInt32)Base.kNumLitPosStatesBitsEncodingMax) + throw new InvalidParamException(); + _numLiteralPosStateBits = (int)v; + break; + } + case CoderPropID.LitContextBits: + { + if (!(prop is Int32)) + throw new InvalidParamException(); + Int32 v = (Int32)prop; + if (v < 0 || v > (UInt32)Base.kNumLitContextBitsMax) + throw new InvalidParamException(); ; + _numLiteralContextBits = (int)v; + break; + } + case CoderPropID.EndMarker: + { + if (!(prop is Boolean)) + throw new InvalidParamException(); + SetWriteEndMarkerMode((Boolean)prop); + break; + } + default: + throw new InvalidParamException(); + } + } + } + + uint _trainSize = 0; + public void SetTrainSize(uint trainSize) + { + _trainSize = trainSize; + } + + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.cs new file mode 100644 index 000000000..7e22450a5 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.cs @@ -0,0 +1,364 @@ +using System; +using System.IO; +namespace SevenZip +{ + using CommandLineParser; + + public class CDoubleStream: Stream + { + public System.IO.Stream s1; + public System.IO.Stream s2; + public int fileIndex; + public long skipSize; + + public override bool CanRead { get { return true; }} + public override bool CanWrite { get { return false; }} + public override bool CanSeek { get { return false; }} + public override long Length { get { return s1.Length + s2.Length - skipSize; } } + public override long Position + { + get { return 0; } + set { } + } + public override void Flush() { } + public override int Read(byte[] buffer, int offset, int count) + { + int numTotal = 0; + while (count > 0) + { + if (fileIndex == 0) + { + int num = s1.Read(buffer, offset, count); + offset += num; + count -= num; + numTotal += num; + if (num == 0) + fileIndex++; + } + if (fileIndex == 1) + { + numTotal += s2.Read(buffer, offset, count); + return numTotal; + } + } + return numTotal; + } + public override void Write(byte[] buffer, int offset, int count) + { + throw (new Exception("can't Write")); + } + public override long Seek(long offset, System.IO.SeekOrigin origin) + { + throw (new Exception("can't Seek")); + } + public override void SetLength(long value) + { + throw (new Exception("can't SetLength")); + } + } + + class LzmaAlone + { + enum Key + { + Help1 = 0, + Help2, + Mode, + Dictionary, + FastBytes, + LitContext, + LitPos, + PosBits, + MatchFinder, + EOS, + StdIn, + StdOut, + Train + }; + + static void PrintHelp() + { + System.Console.WriteLine("\nUsage: LZMA [...] inputFile outputFile\n" + + " e: encode file\n" + + " d: decode file\n" + + " b: Benchmark\n" + + "\n" + + // " -a{N}: set compression mode - [0, 1], default: 1 (max)\n" + + " -d{N}: set dictionary - [0, 29], default: 23 (8MB)\n" + + " -fb{N}: set number of fast bytes - [5, 273], default: 128\n" + + " -lc{N}: set number of literal context bits - [0, 8], default: 3\n" + + " -lp{N}: set number of literal pos bits - [0, 4], default: 0\n" + + " -pb{N}: set number of pos bits - [0, 4], default: 2\n" + + " -mf{MF_ID}: set Match Finder: [bt2, bt4], default: bt4\n" + + " -eos: write End Of Stream marker\n" + // + " -si: read data from stdin\n" + // + " -so: write data to stdout\n" + ); + } + + static bool GetNumber(string s, out Int32 v) + { + v = 0; + for (int i = 0; i < s.Length; i++) + { + char c = s[i]; + if (c < '0' || c > '9') + return false; + v *= 10; + v += (Int32)(c - '0'); + } + return true; + } + + static int IncorrectCommand() + { + throw (new Exception("Command line error")); + // System.Console.WriteLine("\nCommand line error\n"); + // return 1; + } + static int Main2(string[] args) + { + System.Console.WriteLine("\nLZMA# 4.61 2008-11-23\n"); + + if (args.Length == 0) + { + PrintHelp(); + return 0; + } + + SwitchForm[] kSwitchForms = new SwitchForm[13]; + int sw = 0; + kSwitchForms[sw++] = new SwitchForm("?", SwitchType.Simple, false); + kSwitchForms[sw++] = new SwitchForm("H", SwitchType.Simple, false); + kSwitchForms[sw++] = new SwitchForm("A", SwitchType.UnLimitedPostString, false, 1); + kSwitchForms[sw++] = new SwitchForm("D", SwitchType.UnLimitedPostString, false, 1); + kSwitchForms[sw++] = new SwitchForm("FB", SwitchType.UnLimitedPostString, false, 1); + kSwitchForms[sw++] = new SwitchForm("LC", SwitchType.UnLimitedPostString, false, 1); + kSwitchForms[sw++] = new SwitchForm("LP", SwitchType.UnLimitedPostString, false, 1); + kSwitchForms[sw++] = new SwitchForm("PB", SwitchType.UnLimitedPostString, false, 1); + kSwitchForms[sw++] = new SwitchForm("MF", SwitchType.UnLimitedPostString, false, 1); + kSwitchForms[sw++] = new SwitchForm("EOS", SwitchType.Simple, false); + kSwitchForms[sw++] = new SwitchForm("SI", SwitchType.Simple, false); + kSwitchForms[sw++] = new SwitchForm("SO", SwitchType.Simple, false); + kSwitchForms[sw++] = new SwitchForm("T", SwitchType.UnLimitedPostString, false, 1); + + + Parser parser = new Parser(sw); + try + { + parser.ParseStrings(kSwitchForms, args); + } + catch + { + return IncorrectCommand(); + } + + if (parser[(int)Key.Help1].ThereIs || parser[(int)Key.Help2].ThereIs) + { + PrintHelp(); + return 0; + } + + System.Collections.ArrayList nonSwitchStrings = parser.NonSwitchStrings; + + int paramIndex = 0; + if (paramIndex >= nonSwitchStrings.Count) + return IncorrectCommand(); + string command = (string)nonSwitchStrings[paramIndex++]; + command = command.ToLower(); + + bool dictionaryIsDefined = false; + Int32 dictionary = 1 << 21; + if (parser[(int)Key.Dictionary].ThereIs) + { + Int32 dicLog; + if (!GetNumber((string)parser[(int)Key.Dictionary].PostStrings[0], out dicLog)) + IncorrectCommand(); + dictionary = (Int32)1 << dicLog; + dictionaryIsDefined = true; + } + string mf = "bt4"; + if (parser[(int)Key.MatchFinder].ThereIs) + mf = (string)parser[(int)Key.MatchFinder].PostStrings[0]; + mf = mf.ToLower(); + + if (command == "b") + { + const Int32 kNumDefaultItereations = 10; + Int32 numIterations = kNumDefaultItereations; + if (paramIndex < nonSwitchStrings.Count) + if (!GetNumber((string)nonSwitchStrings[paramIndex++], out numIterations)) + numIterations = kNumDefaultItereations; + return LzmaBench.LzmaBenchmark(numIterations, (UInt32)dictionary); + } + + string train = ""; + if (parser[(int)Key.Train].ThereIs) + train = (string)parser[(int)Key.Train].PostStrings[0]; + + bool encodeMode = false; + if (command == "e") + encodeMode = true; + else if (command == "d") + encodeMode = false; + else + IncorrectCommand(); + + bool stdInMode = parser[(int)Key.StdIn].ThereIs; + bool stdOutMode = parser[(int)Key.StdOut].ThereIs; + + Stream inStream = null; + if (stdInMode) + { + throw (new Exception("Not implemeted")); + } + else + { + if (paramIndex >= nonSwitchStrings.Count) + IncorrectCommand(); + string inputName = (string)nonSwitchStrings[paramIndex++]; + inStream = new FileStream(inputName, FileMode.Open, FileAccess.Read); + } + + FileStream outStream = null; + if (stdOutMode) + { + throw (new Exception("Not implemeted")); + } + else + { + if (paramIndex >= nonSwitchStrings.Count) + IncorrectCommand(); + string outputName = (string)nonSwitchStrings[paramIndex++]; + outStream = new FileStream(outputName, FileMode.Create, FileAccess.Write); + } + + FileStream trainStream = null; + if (train.Length != 0) + trainStream = new FileStream(train, FileMode.Open, FileAccess.Read); + + if (encodeMode) + { + if (!dictionaryIsDefined) + dictionary = 1 << 23; + + Int32 posStateBits = 2; + Int32 litContextBits = 3; // for normal files + // UInt32 litContextBits = 0; // for 32-bit data + Int32 litPosBits = 0; + // UInt32 litPosBits = 2; // for 32-bit data + Int32 algorithm = 2; + Int32 numFastBytes = 128; + + bool eos = parser[(int)Key.EOS].ThereIs || stdInMode; + + if (parser[(int)Key.Mode].ThereIs) + if (!GetNumber((string)parser[(int)Key.Mode].PostStrings[0], out algorithm)) + IncorrectCommand(); + + if (parser[(int)Key.FastBytes].ThereIs) + if (!GetNumber((string)parser[(int)Key.FastBytes].PostStrings[0], out numFastBytes)) + IncorrectCommand(); + if (parser[(int)Key.LitContext].ThereIs) + if (!GetNumber((string)parser[(int)Key.LitContext].PostStrings[0], out litContextBits)) + IncorrectCommand(); + if (parser[(int)Key.LitPos].ThereIs) + if (!GetNumber((string)parser[(int)Key.LitPos].PostStrings[0], out litPosBits)) + IncorrectCommand(); + if (parser[(int)Key.PosBits].ThereIs) + if (!GetNumber((string)parser[(int)Key.PosBits].PostStrings[0], out posStateBits)) + IncorrectCommand(); + + CoderPropID[] propIDs = + { + CoderPropID.DictionarySize, + CoderPropID.PosStateBits, + CoderPropID.LitContextBits, + CoderPropID.LitPosBits, + CoderPropID.Algorithm, + CoderPropID.NumFastBytes, + CoderPropID.MatchFinder, + CoderPropID.EndMarker + }; + object[] properties = + { + (Int32)(dictionary), + (Int32)(posStateBits), + (Int32)(litContextBits), + (Int32)(litPosBits), + (Int32)(algorithm), + (Int32)(numFastBytes), + mf, + eos + }; + + Compression.LZMA.Encoder encoder = new Compression.LZMA.Encoder(); + encoder.SetCoderProperties(propIDs, properties); + encoder.WriteCoderProperties(outStream); + Int64 fileSize; + if (eos || stdInMode) + fileSize = -1; + else + fileSize = inStream.Length; + for (int i = 0; i < 8; i++) + outStream.WriteByte((Byte)(fileSize >> (8 * i))); + if (trainStream != null) + { + CDoubleStream doubleStream = new CDoubleStream(); + doubleStream.s1 = trainStream; + doubleStream.s2 = inStream; + doubleStream.fileIndex = 0; + inStream = doubleStream; + long trainFileSize = trainStream.Length; + doubleStream.skipSize = 0; + if (trainFileSize > dictionary) + doubleStream.skipSize = trainFileSize - dictionary; + trainStream.Seek(doubleStream.skipSize, SeekOrigin.Begin); + encoder.SetTrainSize((uint)(trainFileSize - doubleStream.skipSize)); + } + encoder.Code(inStream, outStream, -1, -1, null); + } + else if (command == "d") + { + byte[] properties = new byte[5]; + if (inStream.Read(properties, 0, 5) != 5) + throw (new Exception("input .lzma is too short")); + Compression.LZMA.Decoder decoder = new Compression.LZMA.Decoder(); + decoder.SetDecoderProperties(properties); + if (trainStream != null) + { + if (!decoder.Train(trainStream)) + throw (new Exception("can't train")); + } + long outSize = 0; + for (int i = 0; i < 8; i++) + { + int v = inStream.ReadByte(); + if (v < 0) + throw (new Exception("Can't Read 1")); + outSize |= ((long)(byte)v) << (8 * i); + } + long compressedSize = inStream.Length - inStream.Position; + decoder.Code(inStream, outStream, compressedSize, outSize, null); + } + else + throw (new Exception("Command Error")); + return 0; + } + + [STAThread] + static int Main(string[] args) + { + try + { + return Main2(args); + } + catch (Exception e) + { + Console.WriteLine("{0} Caught exception #1.", e); + // throw e; + return 1; + } + } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.csproj b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.csproj new file mode 100644 index 000000000..6d87b61ff --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.csproj @@ -0,0 +1,90 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {CE33DF18-F9C8-4D6F-9057-DBB4DB96E973} + Exe + LzmaAlone + Lzma# + 4 + + + true + full + false + .\bin\Debug\ + DEBUG;TRACE + + + false + true + .\bin\Release\ + TRACE + AnyCPU + + + + + + + + + Common\CommandLineParser.cs + + + Common\CRC.cs + + + ICoder.cs + + + LZ\IMatchFinder.cs + + + LZ\LzBinTree.cs + + + LZ\LzInWindow.cs + + + LZ\LzOutWindow.cs + + + LZMA\LzmaBase.cs + + + LZMA\LzmaDecoder.cs + + + LZMA\LzmaEncoder.cs + + + RangeCoder\RangeCoder.cs + + + RangeCoder\RangeCoderBit.cs + + + RangeCoder\RangeCoderBitTree.cs + + + Code + + + Code + + + + True + Settings.settings + + + SettingsSingleFileGenerator + Settings.cs + + + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.sln b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.sln new file mode 100644 index 000000000..376cd27a2 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C# Express 2005 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LzmaAlone", "LzmaAlone.csproj", "{CE33DF18-F9C8-4D6F-9057-DBB4DB96E973}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CE33DF18-F9C8-4D6F-9057-DBB4DB96E973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CE33DF18-F9C8-4D6F-9057-DBB4DB96E973}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE33DF18-F9C8-4D6F-9057-DBB4DB96E973}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CE33DF18-F9C8-4D6F-9057-DBB4DB96E973}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaBench.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaBench.cs new file mode 100644 index 000000000..f7b6bd016 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaBench.cs @@ -0,0 +1,340 @@ +// LzmaBench.cs + +using System; +using System.IO; + +namespace SevenZip +{ + /// + /// LZMA Benchmark + /// + internal abstract class LzmaBench + { + const UInt32 kAdditionalSize = (6 << 20); + const UInt32 kCompressedAdditionalSize = (1 << 10); + const UInt32 kMaxLzmaPropSize = 10; + + class CRandomGenerator + { + UInt32 A1; + UInt32 A2; + public CRandomGenerator() { Init(); } + public void Init() { A1 = 362436069; A2 = 521288629; } + public UInt32 GetRnd() + { + return + ((A1 = 36969 * (A1 & 0xffff) + (A1 >> 16)) << 16) ^ + ((A2 = 18000 * (A2 & 0xffff) + (A2 >> 16))); + } + }; + + class CBitRandomGenerator + { + CRandomGenerator RG = new CRandomGenerator(); + UInt32 Value; + int NumBits; + public void Init() + { + Value = 0; + NumBits = 0; + } + public UInt32 GetRnd(int numBits) + { + UInt32 result; + if (NumBits > numBits) + { + result = Value & (((UInt32)1 << numBits) - 1); + Value >>= numBits; + NumBits -= numBits; + return result; + } + numBits -= NumBits; + result = (Value << numBits); + Value = RG.GetRnd(); + result |= Value & (((UInt32)1 << numBits) - 1); + Value >>= numBits; + NumBits = 32 - numBits; + return result; + } + }; + + class CBenchRandomGenerator + { + CBitRandomGenerator RG = new CBitRandomGenerator(); + UInt32 Pos; + UInt32 Rep0; + + public UInt32 BufferSize; + public Byte[] Buffer = null; + + public CBenchRandomGenerator() { } + + public void Set(UInt32 bufferSize) + { + Buffer = new Byte[bufferSize]; + Pos = 0; + BufferSize = bufferSize; + } + UInt32 GetRndBit() { return RG.GetRnd(1); } + UInt32 GetLogRandBits(int numBits) + { + UInt32 len = RG.GetRnd(numBits); + return RG.GetRnd((int)len); + } + UInt32 GetOffset() + { + if (GetRndBit() == 0) + return GetLogRandBits(4); + return (GetLogRandBits(4) << 10) | RG.GetRnd(10); + } + UInt32 GetLen1() { return RG.GetRnd(1 + (int)RG.GetRnd(2)); } + UInt32 GetLen2() { return RG.GetRnd(2 + (int)RG.GetRnd(2)); } + public void Generate() + { + RG.Init(); + Rep0 = 1; + while (Pos < BufferSize) + { + if (GetRndBit() == 0 || Pos < 1) + Buffer[Pos++] = (Byte)RG.GetRnd(8); + else + { + UInt32 len; + if (RG.GetRnd(3) == 0) + len = 1 + GetLen1(); + else + { + do + Rep0 = GetOffset(); + while (Rep0 >= Pos); + Rep0++; + len = 2 + GetLen2(); + } + for (UInt32 i = 0; i < len && Pos < BufferSize; i++, Pos++) + Buffer[Pos] = Buffer[Pos - Rep0]; + } + } + } + }; + + class CrcOutStream : System.IO.Stream + { + public CRC CRC = new CRC(); + public void Init() { CRC.Init(); } + public UInt32 GetDigest() { return CRC.GetDigest(); } + + public override bool CanRead { get { return false; } } + public override bool CanSeek { get { return false; } } + public override bool CanWrite { get { return true; } } + public override Int64 Length { get { return 0; } } + public override Int64 Position { get { return 0; } set { } } + public override void Flush() { } + public override long Seek(long offset, SeekOrigin origin) { return 0; } + public override void SetLength(long value) { } + public override int Read(byte[] buffer, int offset, int count) { return 0; } + + public override void WriteByte(byte b) + { + CRC.UpdateByte(b); + } + public override void Write(byte[] buffer, int offset, int count) + { + CRC.Update(buffer, (uint)offset, (uint)count); + } + }; + + class CProgressInfo : ICodeProgress + { + public Int64 ApprovedStart; + public Int64 InSize; + public System.DateTime Time; + public void Init() { InSize = 0; } + public void SetProgress(Int64 inSize, Int64 outSize) + { + if (inSize >= ApprovedStart && InSize == 0) + { + Time = DateTime.UtcNow; + InSize = inSize; + } + } + } + const int kSubBits = 8; + + static UInt32 GetLogSize(UInt32 size) + { + for (int i = kSubBits; i < 32; i++) + for (UInt32 j = 0; j < (1 << kSubBits); j++) + if (size <= (((UInt32)1) << i) + (j << (i - kSubBits))) + return (UInt32)(i << kSubBits) + j; + return (32 << kSubBits); + } + + static UInt64 MyMultDiv64(UInt64 value, UInt64 elapsedTime) + { + UInt64 freq = TimeSpan.TicksPerSecond; + UInt64 elTime = elapsedTime; + while (freq > 1000000) + { + freq >>= 1; + elTime >>= 1; + } + if (elTime == 0) + elTime = 1; + return value * freq / elTime; + } + + static UInt64 GetCompressRating(UInt32 dictionarySize, UInt64 elapsedTime, UInt64 size) + { + UInt64 t = GetLogSize(dictionarySize) - (18 << kSubBits); + UInt64 numCommandsForOne = 1060 + ((t * t * 10) >> (2 * kSubBits)); + UInt64 numCommands = (UInt64)(size) * numCommandsForOne; + return MyMultDiv64(numCommands, elapsedTime); + } + + static UInt64 GetDecompressRating(UInt64 elapsedTime, UInt64 outSize, UInt64 inSize) + { + UInt64 numCommands = inSize * 220 + outSize * 20; + return MyMultDiv64(numCommands, elapsedTime); + } + + static UInt64 GetTotalRating( + UInt32 dictionarySize, + UInt64 elapsedTimeEn, UInt64 sizeEn, + UInt64 elapsedTimeDe, + UInt64 inSizeDe, UInt64 outSizeDe) + { + return (GetCompressRating(dictionarySize, elapsedTimeEn, sizeEn) + + GetDecompressRating(elapsedTimeDe, inSizeDe, outSizeDe)) / 2; + } + + static void PrintValue(UInt64 v) + { + string s = v.ToString(); + for (int i = 0; i + s.Length < 6; i++) + System.Console.Write(" "); + System.Console.Write(s); + } + + static void PrintRating(UInt64 rating) + { + PrintValue(rating / 1000000); + System.Console.Write(" MIPS"); + } + + static void PrintResults( + UInt32 dictionarySize, + UInt64 elapsedTime, + UInt64 size, + bool decompressMode, UInt64 secondSize) + { + UInt64 speed = MyMultDiv64(size, elapsedTime); + PrintValue(speed / 1024); + System.Console.Write(" KB/s "); + UInt64 rating; + if (decompressMode) + rating = GetDecompressRating(elapsedTime, size, secondSize); + else + rating = GetCompressRating(dictionarySize, elapsedTime, size); + PrintRating(rating); + } + + static public int LzmaBenchmark(Int32 numIterations, UInt32 dictionarySize) + { + if (numIterations <= 0) + return 0; + if (dictionarySize < (1 << 18)) + { + System.Console.WriteLine("\nError: dictionary size for benchmark must be >= 19 (512 KB)"); + return 1; + } + System.Console.Write("\n Compressing Decompressing\n\n"); + + Compression.LZMA.Encoder encoder = new Compression.LZMA.Encoder(); + Compression.LZMA.Decoder decoder = new Compression.LZMA.Decoder(); + + + CoderPropID[] propIDs = + { + CoderPropID.DictionarySize, + }; + object[] properties = + { + (Int32)(dictionarySize), + }; + + UInt32 kBufferSize = dictionarySize + kAdditionalSize; + UInt32 kCompressedBufferSize = (kBufferSize / 2) + kCompressedAdditionalSize; + + encoder.SetCoderProperties(propIDs, properties); + System.IO.MemoryStream propStream = new System.IO.MemoryStream(); + encoder.WriteCoderProperties(propStream); + byte[] propArray = propStream.ToArray(); + + CBenchRandomGenerator rg = new CBenchRandomGenerator(); + + rg.Set(kBufferSize); + rg.Generate(); + CRC crc = new CRC(); + crc.Init(); + crc.Update(rg.Buffer, 0, rg.BufferSize); + + CProgressInfo progressInfo = new CProgressInfo(); + progressInfo.ApprovedStart = dictionarySize; + + UInt64 totalBenchSize = 0; + UInt64 totalEncodeTime = 0; + UInt64 totalDecodeTime = 0; + UInt64 totalCompressedSize = 0; + + MemoryStream inStream = new MemoryStream(rg.Buffer, 0, (int)rg.BufferSize); + MemoryStream compressedStream = new MemoryStream((int)kCompressedBufferSize); + CrcOutStream crcOutStream = new CrcOutStream(); + for (Int32 i = 0; i < numIterations; i++) + { + progressInfo.Init(); + inStream.Seek(0, SeekOrigin.Begin); + compressedStream.Seek(0, SeekOrigin.Begin); + encoder.Code(inStream, compressedStream, -1, -1, progressInfo); + TimeSpan sp2 = DateTime.UtcNow - progressInfo.Time; + UInt64 encodeTime = (UInt64)sp2.Ticks; + + long compressedSize = compressedStream.Position; + if (progressInfo.InSize == 0) + throw (new Exception("Internal ERROR 1282")); + + UInt64 decodeTime = 0; + for (int j = 0; j < 2; j++) + { + compressedStream.Seek(0, SeekOrigin.Begin); + crcOutStream.Init(); + + decoder.SetDecoderProperties(propArray); + UInt64 outSize = kBufferSize; + System.DateTime startTime = DateTime.UtcNow; + decoder.Code(compressedStream, crcOutStream, 0, (Int64)outSize, null); + TimeSpan sp = (DateTime.UtcNow - startTime); + decodeTime = (ulong)sp.Ticks; + if (crcOutStream.GetDigest() != crc.GetDigest()) + throw (new Exception("CRC Error")); + } + UInt64 benchSize = kBufferSize - (UInt64)progressInfo.InSize; + PrintResults(dictionarySize, encodeTime, benchSize, false, 0); + System.Console.Write(" "); + PrintResults(dictionarySize, decodeTime, kBufferSize, true, (ulong)compressedSize); + System.Console.WriteLine(); + + totalBenchSize += benchSize; + totalEncodeTime += encodeTime; + totalDecodeTime += decodeTime; + totalCompressedSize += (ulong)compressedSize; + } + System.Console.WriteLine("---------------------------------------------------"); + PrintResults(dictionarySize, totalEncodeTime, totalBenchSize, false, 0); + System.Console.Write(" "); + PrintResults(dictionarySize, totalDecodeTime, + kBufferSize * (UInt64)numIterations, true, totalCompressedSize); + System.Console.WriteLine(" Average"); + return 0; + } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..961488477 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/AssemblyInfo.cs @@ -0,0 +1,29 @@ +#region Using directives + +using System.Reflection; +using System.Runtime.CompilerServices; + +#endregion + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("LZMA#")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Igor Pavlov")] +[assembly: AssemblyProduct("LZMA# SDK")] +[assembly: AssemblyCopyright("Copyright @ Igor Pavlov 1999-2004")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("4.12.*")] diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Resources.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Resources.cs new file mode 100644 index 000000000..1170cf183 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Resources.cs @@ -0,0 +1,70 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.40607.42 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace LzmaAlone.Properties +{ + using System; + using System.IO; + using System.Resources; + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the Strongly Typed Resource Builder + // class via a tool like ResGen or Visual Studio.NET. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + class Resources + { + + private static System.Resources.ResourceManager _resMgr; + + private static System.Globalization.CultureInfo _resCulture; + + /*FamANDAssem*/ + internal Resources() + { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + public static System.Resources.ResourceManager ResourceManager + { + get + { + if ((_resMgr == null)) + { + System.Resources.ResourceManager temp = new System.Resources.ResourceManager("Resources", typeof(Resources).Assembly); + _resMgr = temp; + } + return _resMgr; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + public static System.Globalization.CultureInfo Culture + { + get + { + return _resCulture; + } + set + { + _resCulture = value; + } + } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Settings.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Settings.cs new file mode 100644 index 000000000..ccfed776b --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Settings.cs @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.40607.42 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace LzmaAlone.Properties +{ + public partial class Settings : System.Configuration.ApplicationSettingsBase + { + private static Settings m_Value; + + private static object m_SyncObject = new object(); + + public static Settings Value + { + get + { + if ((Settings.m_Value == null)) + { + System.Threading.Monitor.Enter(Settings.m_SyncObject); + if ((Settings.m_Value == null)) + { + try + { + Settings.m_Value = new Settings(); + } + finally + { + System.Threading.Monitor.Exit(Settings.m_SyncObject); + } + } + } + return Settings.m_Value; + } + } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoder.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoder.cs new file mode 100644 index 000000000..949c6bbe6 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoder.cs @@ -0,0 +1,234 @@ +using System; + +namespace SevenZip.Compression.RangeCoder +{ + class Encoder + { + public const uint kTopValue = (1 << 24); + + System.IO.Stream Stream; + + public UInt64 Low; + public uint Range; + uint _cacheSize; + byte _cache; + + long StartPosition; + + public void SetStream(System.IO.Stream stream) + { + Stream = stream; + } + + public void ReleaseStream() + { + Stream = null; + } + + public void Init() + { + StartPosition = Stream.Position; + + Low = 0; + Range = 0xFFFFFFFF; + _cacheSize = 1; + _cache = 0; + } + + public void FlushData() + { + for (int i = 0; i < 5; i++) + ShiftLow(); + } + + public void FlushStream() + { + Stream.Flush(); + } + + public void CloseStream() + { + Stream.Close(); + } + + public void Encode(uint start, uint size, uint total) + { + Low += start * (Range /= total); + Range *= size; + while (Range < kTopValue) + { + Range <<= 8; + ShiftLow(); + } + } + + public void ShiftLow() + { + if ((uint)Low < (uint)0xFF000000 || (uint)(Low >> 32) == 1) + { + byte temp = _cache; + do + { + Stream.WriteByte((byte)(temp + (Low >> 32))); + temp = 0xFF; + } + while (--_cacheSize != 0); + _cache = (byte)(((uint)Low) >> 24); + } + _cacheSize++; + Low = ((uint)Low) << 8; + } + + public void EncodeDirectBits(uint v, int numTotalBits) + { + for (int i = numTotalBits - 1; i >= 0; i--) + { + Range >>= 1; + if (((v >> i) & 1) == 1) + Low += Range; + if (Range < kTopValue) + { + Range <<= 8; + ShiftLow(); + } + } + } + + public void EncodeBit(uint size0, int numTotalBits, uint symbol) + { + uint newBound = (Range >> numTotalBits) * size0; + if (symbol == 0) + Range = newBound; + else + { + Low += newBound; + Range -= newBound; + } + while (Range < kTopValue) + { + Range <<= 8; + ShiftLow(); + } + } + + public long GetProcessedSizeAdd() + { + return _cacheSize + + Stream.Position - StartPosition + 4; + // (long)Stream.GetProcessedSize(); + } + } + + class Decoder + { + public const uint kTopValue = (1 << 24); + public uint Range; + public uint Code; + // public Buffer.InBuffer Stream = new Buffer.InBuffer(1 << 16); + public System.IO.Stream Stream; + + public void Init(System.IO.Stream stream) + { + // Stream.Init(stream); + Stream = stream; + + Code = 0; + Range = 0xFFFFFFFF; + for (int i = 0; i < 5; i++) + Code = (Code << 8) | (byte)Stream.ReadByte(); + } + + public void ReleaseStream() + { + // Stream.ReleaseStream(); + Stream = null; + } + + public void CloseStream() + { + Stream.Close(); + } + + public void Normalize() + { + while (Range < kTopValue) + { + Code = (Code << 8) | (byte)Stream.ReadByte(); + Range <<= 8; + } + } + + public void Normalize2() + { + if (Range < kTopValue) + { + Code = (Code << 8) | (byte)Stream.ReadByte(); + Range <<= 8; + } + } + + public uint GetThreshold(uint total) + { + return Code / (Range /= total); + } + + public void Decode(uint start, uint size, uint total) + { + Code -= start * Range; + Range *= size; + Normalize(); + } + + public uint DecodeDirectBits(int numTotalBits) + { + uint range = Range; + uint code = Code; + uint result = 0; + for (int i = numTotalBits; i > 0; i--) + { + range >>= 1; + /* + result <<= 1; + if (code >= range) + { + code -= range; + result |= 1; + } + */ + uint t = (code - range) >> 31; + code -= range & (t - 1); + result = (result << 1) | (1 - t); + + if (range < kTopValue) + { + code = (code << 8) | (byte)Stream.ReadByte(); + range <<= 8; + } + } + Range = range; + Code = code; + return result; + } + + public uint DecodeBit(uint size0, int numTotalBits) + { + uint newBound = (Range >> numTotalBits) * size0; + uint symbol; + if (Code < newBound) + { + symbol = 0; + Range = newBound; + } + else + { + symbol = 1; + Code -= newBound; + Range -= newBound; + } + Normalize(); + return symbol; + } + + // ulong GetProcessedSize() {return Stream.GetProcessedSize(); } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBit.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBit.cs new file mode 100644 index 000000000..4f0346d17 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBit.cs @@ -0,0 +1,117 @@ +using System; + +namespace SevenZip.Compression.RangeCoder +{ + struct BitEncoder + { + public const int kNumBitModelTotalBits = 11; + public const uint kBitModelTotal = (1 << kNumBitModelTotalBits); + const int kNumMoveBits = 5; + const int kNumMoveReducingBits = 2; + public const int kNumBitPriceShiftBits = 6; + + uint Prob; + + public void Init() { Prob = kBitModelTotal >> 1; } + + public void UpdateModel(uint symbol) + { + if (symbol == 0) + Prob += (kBitModelTotal - Prob) >> kNumMoveBits; + else + Prob -= (Prob) >> kNumMoveBits; + } + + public void Encode(Encoder encoder, uint symbol) + { + // encoder.EncodeBit(Prob, kNumBitModelTotalBits, symbol); + // UpdateModel(symbol); + uint newBound = (encoder.Range >> kNumBitModelTotalBits) * Prob; + if (symbol == 0) + { + encoder.Range = newBound; + Prob += (kBitModelTotal - Prob) >> kNumMoveBits; + } + else + { + encoder.Low += newBound; + encoder.Range -= newBound; + Prob -= (Prob) >> kNumMoveBits; + } + if (encoder.Range < Encoder.kTopValue) + { + encoder.Range <<= 8; + encoder.ShiftLow(); + } + } + + private static UInt32[] ProbPrices = new UInt32[kBitModelTotal >> kNumMoveReducingBits]; + + static BitEncoder() + { + const int kNumBits = (kNumBitModelTotalBits - kNumMoveReducingBits); + for (int i = kNumBits - 1; i >= 0; i--) + { + UInt32 start = (UInt32)1 << (kNumBits - i - 1); + UInt32 end = (UInt32)1 << (kNumBits - i); + for (UInt32 j = start; j < end; j++) + ProbPrices[j] = ((UInt32)i << kNumBitPriceShiftBits) + + (((end - j) << kNumBitPriceShiftBits) >> (kNumBits - i - 1)); + } + } + + public uint GetPrice(uint symbol) + { + return ProbPrices[(((Prob - symbol) ^ ((-(int)symbol))) & (kBitModelTotal - 1)) >> kNumMoveReducingBits]; + } + public uint GetPrice0() { return ProbPrices[Prob >> kNumMoveReducingBits]; } + public uint GetPrice1() { return ProbPrices[(kBitModelTotal - Prob) >> kNumMoveReducingBits]; } + } + + struct BitDecoder + { + public const int kNumBitModelTotalBits = 11; + public const uint kBitModelTotal = (1 << kNumBitModelTotalBits); + const int kNumMoveBits = 5; + + uint Prob; + + public void UpdateModel(int numMoveBits, uint symbol) + { + if (symbol == 0) + Prob += (kBitModelTotal - Prob) >> numMoveBits; + else + Prob -= (Prob) >> numMoveBits; + } + + public void Init() { Prob = kBitModelTotal >> 1; } + + public uint Decode(RangeCoder.Decoder rangeDecoder) + { + uint newBound = (uint)(rangeDecoder.Range >> kNumBitModelTotalBits) * (uint)Prob; + if (rangeDecoder.Code < newBound) + { + rangeDecoder.Range = newBound; + Prob += (kBitModelTotal - Prob) >> kNumMoveBits; + if (rangeDecoder.Range < Decoder.kTopValue) + { + rangeDecoder.Code = (rangeDecoder.Code << 8) | (byte)rangeDecoder.Stream.ReadByte(); + rangeDecoder.Range <<= 8; + } + return 0; + } + else + { + rangeDecoder.Range -= newBound; + rangeDecoder.Code -= newBound; + Prob -= (Prob) >> kNumMoveBits; + if (rangeDecoder.Range < Decoder.kTopValue) + { + rangeDecoder.Code = (rangeDecoder.Code << 8) | (byte)rangeDecoder.Stream.ReadByte(); + rangeDecoder.Range <<= 8; + } + return 1; + } + } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBitTree.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBitTree.cs new file mode 100644 index 000000000..4b4506f9d --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBitTree.cs @@ -0,0 +1,157 @@ +using System; + +namespace SevenZip.Compression.RangeCoder +{ + struct BitTreeEncoder + { + BitEncoder[] Models; + int NumBitLevels; + + public BitTreeEncoder(int numBitLevels) + { + NumBitLevels = numBitLevels; + Models = new BitEncoder[1 << numBitLevels]; + } + + public void Init() + { + for (uint i = 1; i < (1 << NumBitLevels); i++) + Models[i].Init(); + } + + public void Encode(Encoder rangeEncoder, UInt32 symbol) + { + UInt32 m = 1; + for (int bitIndex = NumBitLevels; bitIndex > 0; ) + { + bitIndex--; + UInt32 bit = (symbol >> bitIndex) & 1; + Models[m].Encode(rangeEncoder, bit); + m = (m << 1) | bit; + } + } + + public void ReverseEncode(Encoder rangeEncoder, UInt32 symbol) + { + UInt32 m = 1; + for (UInt32 i = 0; i < NumBitLevels; i++) + { + UInt32 bit = symbol & 1; + Models[m].Encode(rangeEncoder, bit); + m = (m << 1) | bit; + symbol >>= 1; + } + } + + public UInt32 GetPrice(UInt32 symbol) + { + UInt32 price = 0; + UInt32 m = 1; + for (int bitIndex = NumBitLevels; bitIndex > 0; ) + { + bitIndex--; + UInt32 bit = (symbol >> bitIndex) & 1; + price += Models[m].GetPrice(bit); + m = (m << 1) + bit; + } + return price; + } + + public UInt32 ReverseGetPrice(UInt32 symbol) + { + UInt32 price = 0; + UInt32 m = 1; + for (int i = NumBitLevels; i > 0; i--) + { + UInt32 bit = symbol & 1; + symbol >>= 1; + price += Models[m].GetPrice(bit); + m = (m << 1) | bit; + } + return price; + } + + public static UInt32 ReverseGetPrice(BitEncoder[] Models, UInt32 startIndex, + int NumBitLevels, UInt32 symbol) + { + UInt32 price = 0; + UInt32 m = 1; + for (int i = NumBitLevels; i > 0; i--) + { + UInt32 bit = symbol & 1; + symbol >>= 1; + price += Models[startIndex + m].GetPrice(bit); + m = (m << 1) | bit; + } + return price; + } + + public static void ReverseEncode(BitEncoder[] Models, UInt32 startIndex, + Encoder rangeEncoder, int NumBitLevels, UInt32 symbol) + { + UInt32 m = 1; + for (int i = 0; i < NumBitLevels; i++) + { + UInt32 bit = symbol & 1; + Models[startIndex + m].Encode(rangeEncoder, bit); + m = (m << 1) | bit; + symbol >>= 1; + } + } + } + + struct BitTreeDecoder + { + BitDecoder[] Models; + int NumBitLevels; + + public BitTreeDecoder(int numBitLevels) + { + NumBitLevels = numBitLevels; + Models = new BitDecoder[1 << numBitLevels]; + } + + public void Init() + { + for (uint i = 1; i < (1 << NumBitLevels); i++) + Models[i].Init(); + } + + public uint Decode(RangeCoder.Decoder rangeDecoder) + { + uint m = 1; + for (int bitIndex = NumBitLevels; bitIndex > 0; bitIndex--) + m = (m << 1) + Models[m].Decode(rangeDecoder); + return m - ((uint)1 << NumBitLevels); + } + + public uint ReverseDecode(RangeCoder.Decoder rangeDecoder) + { + uint m = 1; + uint symbol = 0; + for (int bitIndex = 0; bitIndex < NumBitLevels; bitIndex++) + { + uint bit = Models[m].Decode(rangeDecoder); + m <<= 1; + m += bit; + symbol |= (bit << bitIndex); + } + return symbol; + } + + public static uint ReverseDecode(BitDecoder[] Models, UInt32 startIndex, + RangeCoder.Decoder rangeDecoder, int NumBitLevels) + { + uint m = 1; + uint symbol = 0; + for (int bitIndex = 0; bitIndex < NumBitLevels; bitIndex++) + { + uint bit = Models[startIndex + m].Decode(rangeDecoder); + m <<= 1; + m += bit; + symbol |= (bit << bitIndex); + } + return symbol; + } + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/ICoder.cs b/src/Microsoft.DotNet.Archive/LZMA/ICoder.cs new file mode 100644 index 000000000..c8b95c8d4 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/ICoder.cs @@ -0,0 +1,157 @@ +// ICoder.h + +using System; + +namespace SevenZip +{ + /// + /// The exception that is thrown when an error in input stream occurs during decoding. + /// + class DataErrorException : ApplicationException + { + public DataErrorException(): base("Data Error") { } + } + + /// + /// The exception that is thrown when the value of an argument is outside the allowable range. + /// + class InvalidParamException : ApplicationException + { + public InvalidParamException(): base("Invalid Parameter") { } + } + + public interface ICodeProgress + { + /// + /// Callback progress. + /// + /// + /// input size. -1 if unknown. + /// + /// + /// output size. -1 if unknown. + /// + void SetProgress(Int64 inSize, Int64 outSize); + }; + + public interface ICoder + { + /// + /// Codes streams. + /// + /// + /// input Stream. + /// + /// + /// output Stream. + /// + /// + /// input Size. -1 if unknown. + /// + /// + /// output Size. -1 if unknown. + /// + /// + /// callback progress reference. + /// + /// + /// if input stream is not valid + /// + void Code(System.IO.Stream inStream, System.IO.Stream outStream, + Int64 inSize, Int64 outSize, ICodeProgress progress); + }; + + /* + public interface ICoder2 + { + void Code(ISequentialInStream []inStreams, + const UInt64 []inSizes, + ISequentialOutStream []outStreams, + UInt64 []outSizes, + ICodeProgress progress); + }; + */ + + /// + /// Provides the fields that represent properties idenitifiers for compressing. + /// + public enum CoderPropID + { + /// + /// Specifies default property. + /// + DefaultProp = 0, + /// + /// Specifies size of dictionary. + /// + DictionarySize, + /// + /// Specifies size of memory for PPM*. + /// + UsedMemorySize, + /// + /// Specifies order for PPM methods. + /// + Order, + /// + /// Specifies Block Size. + /// + BlockSize, + /// + /// Specifies number of postion state bits for LZMA (0 <= x <= 4). + /// + PosStateBits, + /// + /// Specifies number of literal context bits for LZMA (0 <= x <= 8). + /// + LitContextBits, + /// + /// Specifies number of literal position bits for LZMA (0 <= x <= 4). + /// + LitPosBits, + /// + /// Specifies number of fast bytes for LZ*. + /// + NumFastBytes, + /// + /// Specifies match finder. LZMA: "BT2", "BT4" or "BT4B". + /// + MatchFinder, + /// + /// Specifies the number of match finder cyckes. + /// + MatchFinderCycles, + /// + /// Specifies number of passes. + /// + NumPasses, + /// + /// Specifies number of algorithm. + /// + Algorithm, + /// + /// Specifies the number of threads. + /// + NumThreads, + /// + /// Specifies mode with end marker. + /// + EndMarker + }; + + + public interface ISetCoderProperties + { + void SetCoderProperties(CoderPropID[] propIDs, object[] properties); + }; + + public interface IWriteCoderProperties + { + void WriteCoderProperties(System.IO.Stream outStream); + } + + public interface ISetDecoderProperties + { + void SetDecoderProperties(byte[] properties); + } +} diff --git a/src/Microsoft.DotNet.Archive/LZMA/README.md b/src/Microsoft.DotNet.Archive/LZMA/README.md new file mode 100644 index 000000000..6ebd85bb4 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/LZMA/README.md @@ -0,0 +1,5 @@ +## LZMA SDK +This source came from the C# implementation of LZMA from the LZMA SDK, version 16.02, from http://www.7-zip.org/sdk.html. + +## License +The LZMA SDK is public domain. Thanks goes to Igor Pavlov for making this available. From e8a65dd54601bce62b742c72728f6e3b7dd3b282 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Fri, 3 Jun 2016 16:18:35 -0700 Subject: [PATCH 44/97] Port LZMA SDK to .NETStandard1.0 as library We're builiding a library and don't need the application-related source so I've removed this in addition to fixing the source to compile as NETStandard1.0. --- .../LZMA/Common/CommandLineParser.cs | 274 ------------- .../LZMA/Common/OutBuffer.cs | 2 +- .../LZMA/Compress/LzmaAlone/LzmaAlone.cs | 364 ------------------ .../LZMA/Compress/LzmaAlone/LzmaAlone.csproj | 90 ----- .../LZMA/Compress/LzmaAlone/LzmaAlone.sln | 20 - .../LZMA/Compress/LzmaAlone/LzmaBench.cs | 340 ---------------- .../LzmaAlone/Properties/AssemblyInfo.cs | 29 -- .../LzmaAlone/Properties/Resources.cs | 70 ---- .../Compress/LzmaAlone/Properties/Settings.cs | 42 -- .../LZMA/Compress/RangeCoder/RangeCoder.cs | 4 +- src/Microsoft.DotNet.Archive/LZMA/ICoder.cs | 4 +- .../Microsoft.DotNet.Archive.xproj | 18 + src/Microsoft.DotNet.Archive/project.json | 14 + 13 files changed, 37 insertions(+), 1234 deletions(-) delete mode 100644 src/Microsoft.DotNet.Archive/LZMA/Common/CommandLineParser.cs delete mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.cs delete mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.csproj delete mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.sln delete mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaBench.cs delete mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/AssemblyInfo.cs delete mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Resources.cs delete mode 100644 src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Settings.cs create mode 100644 src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.xproj create mode 100644 src/Microsoft.DotNet.Archive/project.json diff --git a/src/Microsoft.DotNet.Archive/LZMA/Common/CommandLineParser.cs b/src/Microsoft.DotNet.Archive/LZMA/Common/CommandLineParser.cs deleted file mode 100644 index 8eabf59d1..000000000 --- a/src/Microsoft.DotNet.Archive/LZMA/Common/CommandLineParser.cs +++ /dev/null @@ -1,274 +0,0 @@ -// CommandLineParser.cs - -using System; -using System.Collections; - -namespace SevenZip.CommandLineParser -{ - public enum SwitchType - { - Simple, - PostMinus, - LimitedPostString, - UnLimitedPostString, - PostChar - } - - public class SwitchForm - { - public string IDString; - public SwitchType Type; - public bool Multi; - public int MinLen; - public int MaxLen; - public string PostCharSet; - - public SwitchForm(string idString, SwitchType type, bool multi, - int minLen, int maxLen, string postCharSet) - { - IDString = idString; - Type = type; - Multi = multi; - MinLen = minLen; - MaxLen = maxLen; - PostCharSet = postCharSet; - } - public SwitchForm(string idString, SwitchType type, bool multi, int minLen): - this(idString, type, multi, minLen, 0, "") - { - } - public SwitchForm(string idString, SwitchType type, bool multi): - this(idString, type, multi, 0) - { - } - } - - public class SwitchResult - { - public bool ThereIs; - public bool WithMinus; - public ArrayList PostStrings = new ArrayList(); - public int PostCharIndex; - public SwitchResult() - { - ThereIs = false; - } - } - - public class Parser - { - public ArrayList NonSwitchStrings = new ArrayList(); - SwitchResult[] _switches; - - public Parser(int numSwitches) - { - _switches = new SwitchResult[numSwitches]; - for (int i = 0; i < numSwitches; i++) - _switches[i] = new SwitchResult(); - } - - bool ParseString(string srcString, SwitchForm[] switchForms) - { - int len = srcString.Length; - if (len == 0) - return false; - int pos = 0; - if (!IsItSwitchChar(srcString[pos])) - return false; - while (pos < len) - { - if (IsItSwitchChar(srcString[pos])) - pos++; - const int kNoLen = -1; - int matchedSwitchIndex = 0; - int maxLen = kNoLen; - for (int switchIndex = 0; switchIndex < _switches.Length; switchIndex++) - { - int switchLen = switchForms[switchIndex].IDString.Length; - if (switchLen <= maxLen || pos + switchLen > len) - continue; - if (String.Compare(switchForms[switchIndex].IDString, 0, - srcString, pos, switchLen, true) == 0) - { - matchedSwitchIndex = switchIndex; - maxLen = switchLen; - } - } - if (maxLen == kNoLen) - throw new Exception("maxLen == kNoLen"); - SwitchResult matchedSwitch = _switches[matchedSwitchIndex]; - SwitchForm switchForm = switchForms[matchedSwitchIndex]; - if ((!switchForm.Multi) && matchedSwitch.ThereIs) - throw new Exception("switch must be single"); - matchedSwitch.ThereIs = true; - pos += maxLen; - int tailSize = len - pos; - SwitchType type = switchForm.Type; - switch (type) - { - case SwitchType.PostMinus: - { - if (tailSize == 0) - matchedSwitch.WithMinus = false; - else - { - matchedSwitch.WithMinus = (srcString[pos] == kSwitchMinus); - if (matchedSwitch.WithMinus) - pos++; - } - break; - } - case SwitchType.PostChar: - { - if (tailSize < switchForm.MinLen) - throw new Exception("switch is not full"); - string charSet = switchForm.PostCharSet; - const int kEmptyCharValue = -1; - if (tailSize == 0) - matchedSwitch.PostCharIndex = kEmptyCharValue; - else - { - int index = charSet.IndexOf(srcString[pos]); - if (index < 0) - matchedSwitch.PostCharIndex = kEmptyCharValue; - else - { - matchedSwitch.PostCharIndex = index; - pos++; - } - } - break; - } - case SwitchType.LimitedPostString: - case SwitchType.UnLimitedPostString: - { - int minLen = switchForm.MinLen; - if (tailSize < minLen) - throw new Exception("switch is not full"); - if (type == SwitchType.UnLimitedPostString) - { - matchedSwitch.PostStrings.Add(srcString.Substring(pos)); - return true; - } - String stringSwitch = srcString.Substring(pos, minLen); - pos += minLen; - for (int i = minLen; i < switchForm.MaxLen && pos < len; i++, pos++) - { - char c = srcString[pos]; - if (IsItSwitchChar(c)) - break; - stringSwitch += c; - } - matchedSwitch.PostStrings.Add(stringSwitch); - break; - } - } - } - return true; - - } - - public void ParseStrings(SwitchForm[] switchForms, string[] commandStrings) - { - int numCommandStrings = commandStrings.Length; - bool stopSwitch = false; - for (int i = 0; i < numCommandStrings; i++) - { - string s = commandStrings[i]; - if (stopSwitch) - NonSwitchStrings.Add(s); - else - if (s == kStopSwitchParsing) - stopSwitch = true; - else - if (!ParseString(s, switchForms)) - NonSwitchStrings.Add(s); - } - } - - public SwitchResult this[int index] { get { return _switches[index]; } } - - public static int ParseCommand(CommandForm[] commandForms, string commandString, - out string postString) - { - for (int i = 0; i < commandForms.Length; i++) - { - string id = commandForms[i].IDString; - if (commandForms[i].PostStringMode) - { - if (commandString.IndexOf(id) == 0) - { - postString = commandString.Substring(id.Length); - return i; - } - } - else - if (commandString == id) - { - postString = ""; - return i; - } - } - postString = ""; - return -1; - } - - static bool ParseSubCharsCommand(int numForms, CommandSubCharsSet[] forms, - string commandString, ArrayList indices) - { - indices.Clear(); - int numUsedChars = 0; - for (int i = 0; i < numForms; i++) - { - CommandSubCharsSet charsSet = forms[i]; - int currentIndex = -1; - int len = charsSet.Chars.Length; - for (int j = 0; j < len; j++) - { - char c = charsSet.Chars[j]; - int newIndex = commandString.IndexOf(c); - if (newIndex >= 0) - { - if (currentIndex >= 0) - return false; - if (commandString.IndexOf(c, newIndex + 1) >= 0) - return false; - currentIndex = j; - numUsedChars++; - } - } - if (currentIndex == -1 && !charsSet.EmptyAllowed) - return false; - indices.Add(currentIndex); - } - return (numUsedChars == commandString.Length); - } - const char kSwitchID1 = '-'; - const char kSwitchID2 = '/'; - - const char kSwitchMinus = '-'; - const string kStopSwitchParsing = "--"; - - static bool IsItSwitchChar(char c) - { - return (c == kSwitchID1 || c == kSwitchID2); - } - } - - public class CommandForm - { - public string IDString = ""; - public bool PostStringMode = false; - public CommandForm(string idString, bool postStringMode) - { - IDString = idString; - PostStringMode = postStringMode; - } - } - - class CommandSubCharsSet - { - public string Chars = ""; - public bool EmptyAllowed = false; - } -} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs b/src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs index 2da16e162..58c79544d 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs @@ -18,7 +18,7 @@ namespace SevenZip.Buffer public void SetStream(System.IO.Stream stream) { m_Stream = stream; } public void FlushStream() { m_Stream.Flush(); } - public void CloseStream() { m_Stream.Close(); } + public void CloseStream() { m_Stream.Dispose(); } public void ReleaseStream() { m_Stream = null; } public void Init() diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.cs deleted file mode 100644 index 7e22450a5..000000000 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.cs +++ /dev/null @@ -1,364 +0,0 @@ -using System; -using System.IO; -namespace SevenZip -{ - using CommandLineParser; - - public class CDoubleStream: Stream - { - public System.IO.Stream s1; - public System.IO.Stream s2; - public int fileIndex; - public long skipSize; - - public override bool CanRead { get { return true; }} - public override bool CanWrite { get { return false; }} - public override bool CanSeek { get { return false; }} - public override long Length { get { return s1.Length + s2.Length - skipSize; } } - public override long Position - { - get { return 0; } - set { } - } - public override void Flush() { } - public override int Read(byte[] buffer, int offset, int count) - { - int numTotal = 0; - while (count > 0) - { - if (fileIndex == 0) - { - int num = s1.Read(buffer, offset, count); - offset += num; - count -= num; - numTotal += num; - if (num == 0) - fileIndex++; - } - if (fileIndex == 1) - { - numTotal += s2.Read(buffer, offset, count); - return numTotal; - } - } - return numTotal; - } - public override void Write(byte[] buffer, int offset, int count) - { - throw (new Exception("can't Write")); - } - public override long Seek(long offset, System.IO.SeekOrigin origin) - { - throw (new Exception("can't Seek")); - } - public override void SetLength(long value) - { - throw (new Exception("can't SetLength")); - } - } - - class LzmaAlone - { - enum Key - { - Help1 = 0, - Help2, - Mode, - Dictionary, - FastBytes, - LitContext, - LitPos, - PosBits, - MatchFinder, - EOS, - StdIn, - StdOut, - Train - }; - - static void PrintHelp() - { - System.Console.WriteLine("\nUsage: LZMA [...] inputFile outputFile\n" + - " e: encode file\n" + - " d: decode file\n" + - " b: Benchmark\n" + - "\n" + - // " -a{N}: set compression mode - [0, 1], default: 1 (max)\n" + - " -d{N}: set dictionary - [0, 29], default: 23 (8MB)\n" + - " -fb{N}: set number of fast bytes - [5, 273], default: 128\n" + - " -lc{N}: set number of literal context bits - [0, 8], default: 3\n" + - " -lp{N}: set number of literal pos bits - [0, 4], default: 0\n" + - " -pb{N}: set number of pos bits - [0, 4], default: 2\n" + - " -mf{MF_ID}: set Match Finder: [bt2, bt4], default: bt4\n" + - " -eos: write End Of Stream marker\n" - // + " -si: read data from stdin\n" - // + " -so: write data to stdout\n" - ); - } - - static bool GetNumber(string s, out Int32 v) - { - v = 0; - for (int i = 0; i < s.Length; i++) - { - char c = s[i]; - if (c < '0' || c > '9') - return false; - v *= 10; - v += (Int32)(c - '0'); - } - return true; - } - - static int IncorrectCommand() - { - throw (new Exception("Command line error")); - // System.Console.WriteLine("\nCommand line error\n"); - // return 1; - } - static int Main2(string[] args) - { - System.Console.WriteLine("\nLZMA# 4.61 2008-11-23\n"); - - if (args.Length == 0) - { - PrintHelp(); - return 0; - } - - SwitchForm[] kSwitchForms = new SwitchForm[13]; - int sw = 0; - kSwitchForms[sw++] = new SwitchForm("?", SwitchType.Simple, false); - kSwitchForms[sw++] = new SwitchForm("H", SwitchType.Simple, false); - kSwitchForms[sw++] = new SwitchForm("A", SwitchType.UnLimitedPostString, false, 1); - kSwitchForms[sw++] = new SwitchForm("D", SwitchType.UnLimitedPostString, false, 1); - kSwitchForms[sw++] = new SwitchForm("FB", SwitchType.UnLimitedPostString, false, 1); - kSwitchForms[sw++] = new SwitchForm("LC", SwitchType.UnLimitedPostString, false, 1); - kSwitchForms[sw++] = new SwitchForm("LP", SwitchType.UnLimitedPostString, false, 1); - kSwitchForms[sw++] = new SwitchForm("PB", SwitchType.UnLimitedPostString, false, 1); - kSwitchForms[sw++] = new SwitchForm("MF", SwitchType.UnLimitedPostString, false, 1); - kSwitchForms[sw++] = new SwitchForm("EOS", SwitchType.Simple, false); - kSwitchForms[sw++] = new SwitchForm("SI", SwitchType.Simple, false); - kSwitchForms[sw++] = new SwitchForm("SO", SwitchType.Simple, false); - kSwitchForms[sw++] = new SwitchForm("T", SwitchType.UnLimitedPostString, false, 1); - - - Parser parser = new Parser(sw); - try - { - parser.ParseStrings(kSwitchForms, args); - } - catch - { - return IncorrectCommand(); - } - - if (parser[(int)Key.Help1].ThereIs || parser[(int)Key.Help2].ThereIs) - { - PrintHelp(); - return 0; - } - - System.Collections.ArrayList nonSwitchStrings = parser.NonSwitchStrings; - - int paramIndex = 0; - if (paramIndex >= nonSwitchStrings.Count) - return IncorrectCommand(); - string command = (string)nonSwitchStrings[paramIndex++]; - command = command.ToLower(); - - bool dictionaryIsDefined = false; - Int32 dictionary = 1 << 21; - if (parser[(int)Key.Dictionary].ThereIs) - { - Int32 dicLog; - if (!GetNumber((string)parser[(int)Key.Dictionary].PostStrings[0], out dicLog)) - IncorrectCommand(); - dictionary = (Int32)1 << dicLog; - dictionaryIsDefined = true; - } - string mf = "bt4"; - if (parser[(int)Key.MatchFinder].ThereIs) - mf = (string)parser[(int)Key.MatchFinder].PostStrings[0]; - mf = mf.ToLower(); - - if (command == "b") - { - const Int32 kNumDefaultItereations = 10; - Int32 numIterations = kNumDefaultItereations; - if (paramIndex < nonSwitchStrings.Count) - if (!GetNumber((string)nonSwitchStrings[paramIndex++], out numIterations)) - numIterations = kNumDefaultItereations; - return LzmaBench.LzmaBenchmark(numIterations, (UInt32)dictionary); - } - - string train = ""; - if (parser[(int)Key.Train].ThereIs) - train = (string)parser[(int)Key.Train].PostStrings[0]; - - bool encodeMode = false; - if (command == "e") - encodeMode = true; - else if (command == "d") - encodeMode = false; - else - IncorrectCommand(); - - bool stdInMode = parser[(int)Key.StdIn].ThereIs; - bool stdOutMode = parser[(int)Key.StdOut].ThereIs; - - Stream inStream = null; - if (stdInMode) - { - throw (new Exception("Not implemeted")); - } - else - { - if (paramIndex >= nonSwitchStrings.Count) - IncorrectCommand(); - string inputName = (string)nonSwitchStrings[paramIndex++]; - inStream = new FileStream(inputName, FileMode.Open, FileAccess.Read); - } - - FileStream outStream = null; - if (stdOutMode) - { - throw (new Exception("Not implemeted")); - } - else - { - if (paramIndex >= nonSwitchStrings.Count) - IncorrectCommand(); - string outputName = (string)nonSwitchStrings[paramIndex++]; - outStream = new FileStream(outputName, FileMode.Create, FileAccess.Write); - } - - FileStream trainStream = null; - if (train.Length != 0) - trainStream = new FileStream(train, FileMode.Open, FileAccess.Read); - - if (encodeMode) - { - if (!dictionaryIsDefined) - dictionary = 1 << 23; - - Int32 posStateBits = 2; - Int32 litContextBits = 3; // for normal files - // UInt32 litContextBits = 0; // for 32-bit data - Int32 litPosBits = 0; - // UInt32 litPosBits = 2; // for 32-bit data - Int32 algorithm = 2; - Int32 numFastBytes = 128; - - bool eos = parser[(int)Key.EOS].ThereIs || stdInMode; - - if (parser[(int)Key.Mode].ThereIs) - if (!GetNumber((string)parser[(int)Key.Mode].PostStrings[0], out algorithm)) - IncorrectCommand(); - - if (parser[(int)Key.FastBytes].ThereIs) - if (!GetNumber((string)parser[(int)Key.FastBytes].PostStrings[0], out numFastBytes)) - IncorrectCommand(); - if (parser[(int)Key.LitContext].ThereIs) - if (!GetNumber((string)parser[(int)Key.LitContext].PostStrings[0], out litContextBits)) - IncorrectCommand(); - if (parser[(int)Key.LitPos].ThereIs) - if (!GetNumber((string)parser[(int)Key.LitPos].PostStrings[0], out litPosBits)) - IncorrectCommand(); - if (parser[(int)Key.PosBits].ThereIs) - if (!GetNumber((string)parser[(int)Key.PosBits].PostStrings[0], out posStateBits)) - IncorrectCommand(); - - CoderPropID[] propIDs = - { - CoderPropID.DictionarySize, - CoderPropID.PosStateBits, - CoderPropID.LitContextBits, - CoderPropID.LitPosBits, - CoderPropID.Algorithm, - CoderPropID.NumFastBytes, - CoderPropID.MatchFinder, - CoderPropID.EndMarker - }; - object[] properties = - { - (Int32)(dictionary), - (Int32)(posStateBits), - (Int32)(litContextBits), - (Int32)(litPosBits), - (Int32)(algorithm), - (Int32)(numFastBytes), - mf, - eos - }; - - Compression.LZMA.Encoder encoder = new Compression.LZMA.Encoder(); - encoder.SetCoderProperties(propIDs, properties); - encoder.WriteCoderProperties(outStream); - Int64 fileSize; - if (eos || stdInMode) - fileSize = -1; - else - fileSize = inStream.Length; - for (int i = 0; i < 8; i++) - outStream.WriteByte((Byte)(fileSize >> (8 * i))); - if (trainStream != null) - { - CDoubleStream doubleStream = new CDoubleStream(); - doubleStream.s1 = trainStream; - doubleStream.s2 = inStream; - doubleStream.fileIndex = 0; - inStream = doubleStream; - long trainFileSize = trainStream.Length; - doubleStream.skipSize = 0; - if (trainFileSize > dictionary) - doubleStream.skipSize = trainFileSize - dictionary; - trainStream.Seek(doubleStream.skipSize, SeekOrigin.Begin); - encoder.SetTrainSize((uint)(trainFileSize - doubleStream.skipSize)); - } - encoder.Code(inStream, outStream, -1, -1, null); - } - else if (command == "d") - { - byte[] properties = new byte[5]; - if (inStream.Read(properties, 0, 5) != 5) - throw (new Exception("input .lzma is too short")); - Compression.LZMA.Decoder decoder = new Compression.LZMA.Decoder(); - decoder.SetDecoderProperties(properties); - if (trainStream != null) - { - if (!decoder.Train(trainStream)) - throw (new Exception("can't train")); - } - long outSize = 0; - for (int i = 0; i < 8; i++) - { - int v = inStream.ReadByte(); - if (v < 0) - throw (new Exception("Can't Read 1")); - outSize |= ((long)(byte)v) << (8 * i); - } - long compressedSize = inStream.Length - inStream.Position; - decoder.Code(inStream, outStream, compressedSize, outSize, null); - } - else - throw (new Exception("Command Error")); - return 0; - } - - [STAThread] - static int Main(string[] args) - { - try - { - return Main2(args); - } - catch (Exception e) - { - Console.WriteLine("{0} Caught exception #1.", e); - // throw e; - return 1; - } - } - } -} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.csproj b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.csproj deleted file mode 100644 index 6d87b61ff..000000000 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.csproj +++ /dev/null @@ -1,90 +0,0 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {CE33DF18-F9C8-4D6F-9057-DBB4DB96E973} - Exe - LzmaAlone - Lzma# - 4 - - - true - full - false - .\bin\Debug\ - DEBUG;TRACE - - - false - true - .\bin\Release\ - TRACE - AnyCPU - - - - - - - - - Common\CommandLineParser.cs - - - Common\CRC.cs - - - ICoder.cs - - - LZ\IMatchFinder.cs - - - LZ\LzBinTree.cs - - - LZ\LzInWindow.cs - - - LZ\LzOutWindow.cs - - - LZMA\LzmaBase.cs - - - LZMA\LzmaDecoder.cs - - - LZMA\LzmaEncoder.cs - - - RangeCoder\RangeCoder.cs - - - RangeCoder\RangeCoderBit.cs - - - RangeCoder\RangeCoderBitTree.cs - - - Code - - - Code - - - - True - Settings.settings - - - SettingsSingleFileGenerator - Settings.cs - - - - - \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.sln b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.sln deleted file mode 100644 index 376cd27a2..000000000 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaAlone.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C# Express 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LzmaAlone", "LzmaAlone.csproj", "{CE33DF18-F9C8-4D6F-9057-DBB4DB96E973}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CE33DF18-F9C8-4D6F-9057-DBB4DB96E973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE33DF18-F9C8-4D6F-9057-DBB4DB96E973}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE33DF18-F9C8-4D6F-9057-DBB4DB96E973}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE33DF18-F9C8-4D6F-9057-DBB4DB96E973}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaBench.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaBench.cs deleted file mode 100644 index f7b6bd016..000000000 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/LzmaBench.cs +++ /dev/null @@ -1,340 +0,0 @@ -// LzmaBench.cs - -using System; -using System.IO; - -namespace SevenZip -{ - /// - /// LZMA Benchmark - /// - internal abstract class LzmaBench - { - const UInt32 kAdditionalSize = (6 << 20); - const UInt32 kCompressedAdditionalSize = (1 << 10); - const UInt32 kMaxLzmaPropSize = 10; - - class CRandomGenerator - { - UInt32 A1; - UInt32 A2; - public CRandomGenerator() { Init(); } - public void Init() { A1 = 362436069; A2 = 521288629; } - public UInt32 GetRnd() - { - return - ((A1 = 36969 * (A1 & 0xffff) + (A1 >> 16)) << 16) ^ - ((A2 = 18000 * (A2 & 0xffff) + (A2 >> 16))); - } - }; - - class CBitRandomGenerator - { - CRandomGenerator RG = new CRandomGenerator(); - UInt32 Value; - int NumBits; - public void Init() - { - Value = 0; - NumBits = 0; - } - public UInt32 GetRnd(int numBits) - { - UInt32 result; - if (NumBits > numBits) - { - result = Value & (((UInt32)1 << numBits) - 1); - Value >>= numBits; - NumBits -= numBits; - return result; - } - numBits -= NumBits; - result = (Value << numBits); - Value = RG.GetRnd(); - result |= Value & (((UInt32)1 << numBits) - 1); - Value >>= numBits; - NumBits = 32 - numBits; - return result; - } - }; - - class CBenchRandomGenerator - { - CBitRandomGenerator RG = new CBitRandomGenerator(); - UInt32 Pos; - UInt32 Rep0; - - public UInt32 BufferSize; - public Byte[] Buffer = null; - - public CBenchRandomGenerator() { } - - public void Set(UInt32 bufferSize) - { - Buffer = new Byte[bufferSize]; - Pos = 0; - BufferSize = bufferSize; - } - UInt32 GetRndBit() { return RG.GetRnd(1); } - UInt32 GetLogRandBits(int numBits) - { - UInt32 len = RG.GetRnd(numBits); - return RG.GetRnd((int)len); - } - UInt32 GetOffset() - { - if (GetRndBit() == 0) - return GetLogRandBits(4); - return (GetLogRandBits(4) << 10) | RG.GetRnd(10); - } - UInt32 GetLen1() { return RG.GetRnd(1 + (int)RG.GetRnd(2)); } - UInt32 GetLen2() { return RG.GetRnd(2 + (int)RG.GetRnd(2)); } - public void Generate() - { - RG.Init(); - Rep0 = 1; - while (Pos < BufferSize) - { - if (GetRndBit() == 0 || Pos < 1) - Buffer[Pos++] = (Byte)RG.GetRnd(8); - else - { - UInt32 len; - if (RG.GetRnd(3) == 0) - len = 1 + GetLen1(); - else - { - do - Rep0 = GetOffset(); - while (Rep0 >= Pos); - Rep0++; - len = 2 + GetLen2(); - } - for (UInt32 i = 0; i < len && Pos < BufferSize; i++, Pos++) - Buffer[Pos] = Buffer[Pos - Rep0]; - } - } - } - }; - - class CrcOutStream : System.IO.Stream - { - public CRC CRC = new CRC(); - public void Init() { CRC.Init(); } - public UInt32 GetDigest() { return CRC.GetDigest(); } - - public override bool CanRead { get { return false; } } - public override bool CanSeek { get { return false; } } - public override bool CanWrite { get { return true; } } - public override Int64 Length { get { return 0; } } - public override Int64 Position { get { return 0; } set { } } - public override void Flush() { } - public override long Seek(long offset, SeekOrigin origin) { return 0; } - public override void SetLength(long value) { } - public override int Read(byte[] buffer, int offset, int count) { return 0; } - - public override void WriteByte(byte b) - { - CRC.UpdateByte(b); - } - public override void Write(byte[] buffer, int offset, int count) - { - CRC.Update(buffer, (uint)offset, (uint)count); - } - }; - - class CProgressInfo : ICodeProgress - { - public Int64 ApprovedStart; - public Int64 InSize; - public System.DateTime Time; - public void Init() { InSize = 0; } - public void SetProgress(Int64 inSize, Int64 outSize) - { - if (inSize >= ApprovedStart && InSize == 0) - { - Time = DateTime.UtcNow; - InSize = inSize; - } - } - } - const int kSubBits = 8; - - static UInt32 GetLogSize(UInt32 size) - { - for (int i = kSubBits; i < 32; i++) - for (UInt32 j = 0; j < (1 << kSubBits); j++) - if (size <= (((UInt32)1) << i) + (j << (i - kSubBits))) - return (UInt32)(i << kSubBits) + j; - return (32 << kSubBits); - } - - static UInt64 MyMultDiv64(UInt64 value, UInt64 elapsedTime) - { - UInt64 freq = TimeSpan.TicksPerSecond; - UInt64 elTime = elapsedTime; - while (freq > 1000000) - { - freq >>= 1; - elTime >>= 1; - } - if (elTime == 0) - elTime = 1; - return value * freq / elTime; - } - - static UInt64 GetCompressRating(UInt32 dictionarySize, UInt64 elapsedTime, UInt64 size) - { - UInt64 t = GetLogSize(dictionarySize) - (18 << kSubBits); - UInt64 numCommandsForOne = 1060 + ((t * t * 10) >> (2 * kSubBits)); - UInt64 numCommands = (UInt64)(size) * numCommandsForOne; - return MyMultDiv64(numCommands, elapsedTime); - } - - static UInt64 GetDecompressRating(UInt64 elapsedTime, UInt64 outSize, UInt64 inSize) - { - UInt64 numCommands = inSize * 220 + outSize * 20; - return MyMultDiv64(numCommands, elapsedTime); - } - - static UInt64 GetTotalRating( - UInt32 dictionarySize, - UInt64 elapsedTimeEn, UInt64 sizeEn, - UInt64 elapsedTimeDe, - UInt64 inSizeDe, UInt64 outSizeDe) - { - return (GetCompressRating(dictionarySize, elapsedTimeEn, sizeEn) + - GetDecompressRating(elapsedTimeDe, inSizeDe, outSizeDe)) / 2; - } - - static void PrintValue(UInt64 v) - { - string s = v.ToString(); - for (int i = 0; i + s.Length < 6; i++) - System.Console.Write(" "); - System.Console.Write(s); - } - - static void PrintRating(UInt64 rating) - { - PrintValue(rating / 1000000); - System.Console.Write(" MIPS"); - } - - static void PrintResults( - UInt32 dictionarySize, - UInt64 elapsedTime, - UInt64 size, - bool decompressMode, UInt64 secondSize) - { - UInt64 speed = MyMultDiv64(size, elapsedTime); - PrintValue(speed / 1024); - System.Console.Write(" KB/s "); - UInt64 rating; - if (decompressMode) - rating = GetDecompressRating(elapsedTime, size, secondSize); - else - rating = GetCompressRating(dictionarySize, elapsedTime, size); - PrintRating(rating); - } - - static public int LzmaBenchmark(Int32 numIterations, UInt32 dictionarySize) - { - if (numIterations <= 0) - return 0; - if (dictionarySize < (1 << 18)) - { - System.Console.WriteLine("\nError: dictionary size for benchmark must be >= 19 (512 KB)"); - return 1; - } - System.Console.Write("\n Compressing Decompressing\n\n"); - - Compression.LZMA.Encoder encoder = new Compression.LZMA.Encoder(); - Compression.LZMA.Decoder decoder = new Compression.LZMA.Decoder(); - - - CoderPropID[] propIDs = - { - CoderPropID.DictionarySize, - }; - object[] properties = - { - (Int32)(dictionarySize), - }; - - UInt32 kBufferSize = dictionarySize + kAdditionalSize; - UInt32 kCompressedBufferSize = (kBufferSize / 2) + kCompressedAdditionalSize; - - encoder.SetCoderProperties(propIDs, properties); - System.IO.MemoryStream propStream = new System.IO.MemoryStream(); - encoder.WriteCoderProperties(propStream); - byte[] propArray = propStream.ToArray(); - - CBenchRandomGenerator rg = new CBenchRandomGenerator(); - - rg.Set(kBufferSize); - rg.Generate(); - CRC crc = new CRC(); - crc.Init(); - crc.Update(rg.Buffer, 0, rg.BufferSize); - - CProgressInfo progressInfo = new CProgressInfo(); - progressInfo.ApprovedStart = dictionarySize; - - UInt64 totalBenchSize = 0; - UInt64 totalEncodeTime = 0; - UInt64 totalDecodeTime = 0; - UInt64 totalCompressedSize = 0; - - MemoryStream inStream = new MemoryStream(rg.Buffer, 0, (int)rg.BufferSize); - MemoryStream compressedStream = new MemoryStream((int)kCompressedBufferSize); - CrcOutStream crcOutStream = new CrcOutStream(); - for (Int32 i = 0; i < numIterations; i++) - { - progressInfo.Init(); - inStream.Seek(0, SeekOrigin.Begin); - compressedStream.Seek(0, SeekOrigin.Begin); - encoder.Code(inStream, compressedStream, -1, -1, progressInfo); - TimeSpan sp2 = DateTime.UtcNow - progressInfo.Time; - UInt64 encodeTime = (UInt64)sp2.Ticks; - - long compressedSize = compressedStream.Position; - if (progressInfo.InSize == 0) - throw (new Exception("Internal ERROR 1282")); - - UInt64 decodeTime = 0; - for (int j = 0; j < 2; j++) - { - compressedStream.Seek(0, SeekOrigin.Begin); - crcOutStream.Init(); - - decoder.SetDecoderProperties(propArray); - UInt64 outSize = kBufferSize; - System.DateTime startTime = DateTime.UtcNow; - decoder.Code(compressedStream, crcOutStream, 0, (Int64)outSize, null); - TimeSpan sp = (DateTime.UtcNow - startTime); - decodeTime = (ulong)sp.Ticks; - if (crcOutStream.GetDigest() != crc.GetDigest()) - throw (new Exception("CRC Error")); - } - UInt64 benchSize = kBufferSize - (UInt64)progressInfo.InSize; - PrintResults(dictionarySize, encodeTime, benchSize, false, 0); - System.Console.Write(" "); - PrintResults(dictionarySize, decodeTime, kBufferSize, true, (ulong)compressedSize); - System.Console.WriteLine(); - - totalBenchSize += benchSize; - totalEncodeTime += encodeTime; - totalDecodeTime += decodeTime; - totalCompressedSize += (ulong)compressedSize; - } - System.Console.WriteLine("---------------------------------------------------"); - PrintResults(dictionarySize, totalEncodeTime, totalBenchSize, false, 0); - System.Console.Write(" "); - PrintResults(dictionarySize, totalDecodeTime, - kBufferSize * (UInt64)numIterations, true, totalCompressedSize); - System.Console.WriteLine(" Average"); - return 0; - } - } -} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/AssemblyInfo.cs deleted file mode 100644 index 961488477..000000000 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -#region Using directives - -using System.Reflection; -using System.Runtime.CompilerServices; - -#endregion - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("LZMA#")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Igor Pavlov")] -[assembly: AssemblyProduct("LZMA# SDK")] -[assembly: AssemblyCopyright("Copyright @ Igor Pavlov 1999-2004")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("4.12.*")] diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Resources.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Resources.cs deleted file mode 100644 index 1170cf183..000000000 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Resources.cs +++ /dev/null @@ -1,70 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.40607.42 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace LzmaAlone.Properties -{ - using System; - using System.IO; - using System.Resources; - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the Strongly Typed Resource Builder - // class via a tool like ResGen or Visual Studio.NET. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - class Resources - { - - private static System.Resources.ResourceManager _resMgr; - - private static System.Globalization.CultureInfo _resCulture; - - /*FamANDAssem*/ - internal Resources() - { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - public static System.Resources.ResourceManager ResourceManager - { - get - { - if ((_resMgr == null)) - { - System.Resources.ResourceManager temp = new System.Resources.ResourceManager("Resources", typeof(Resources).Assembly); - _resMgr = temp; - } - return _resMgr; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - public static System.Globalization.CultureInfo Culture - { - get - { - return _resCulture; - } - set - { - _resCulture = value; - } - } - } -} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Settings.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Settings.cs deleted file mode 100644 index ccfed776b..000000000 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LzmaAlone/Properties/Settings.cs +++ /dev/null @@ -1,42 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:2.0.40607.42 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace LzmaAlone.Properties -{ - public partial class Settings : System.Configuration.ApplicationSettingsBase - { - private static Settings m_Value; - - private static object m_SyncObject = new object(); - - public static Settings Value - { - get - { - if ((Settings.m_Value == null)) - { - System.Threading.Monitor.Enter(Settings.m_SyncObject); - if ((Settings.m_Value == null)) - { - try - { - Settings.m_Value = new Settings(); - } - finally - { - System.Threading.Monitor.Exit(Settings.m_SyncObject); - } - } - } - return Settings.m_Value; - } - } - } -} diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoder.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoder.cs index 949c6bbe6..a4ef8ee32 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoder.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoder.cs @@ -48,7 +48,7 @@ namespace SevenZip.Compression.RangeCoder public void CloseStream() { - Stream.Close(); + Stream.Dispose(); } public void Encode(uint start, uint size, uint total) @@ -146,7 +146,7 @@ namespace SevenZip.Compression.RangeCoder public void CloseStream() { - Stream.Close(); + Stream.Dispose(); } public void Normalize() diff --git a/src/Microsoft.DotNet.Archive/LZMA/ICoder.cs b/src/Microsoft.DotNet.Archive/LZMA/ICoder.cs index c8b95c8d4..9ce106419 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/ICoder.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/ICoder.cs @@ -7,7 +7,7 @@ namespace SevenZip /// /// The exception that is thrown when an error in input stream occurs during decoding. /// - class DataErrorException : ApplicationException + class DataErrorException : Exception { public DataErrorException(): base("Data Error") { } } @@ -15,7 +15,7 @@ namespace SevenZip /// /// The exception that is thrown when the value of an argument is outside the allowable range. /// - class InvalidParamException : ApplicationException + class InvalidParamException : Exception { public InvalidParamException(): base("Invalid Parameter") { } } diff --git a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.xproj b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.xproj new file mode 100644 index 000000000..775c85857 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.xproj @@ -0,0 +1,18 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 35b19f22-b8c0-4849-9c35-3f809b7588b8 + Microsoft.DotNet.Archive + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin + + + 2.0 + + + \ No newline at end of file diff --git a/src/Microsoft.DotNet.Archive/project.json b/src/Microsoft.DotNet.Archive/project.json new file mode 100644 index 000000000..7356ba390 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/project.json @@ -0,0 +1,14 @@ +{ + "version": "1.0.0-preview3-*", + "buildOptions": { + "keyFile": "../../tools/Key.snk" + }, + "description": "Archive and compression types.", + "dependencies": { + "NETStandard.Library": "1.6.0-rc3-24201-00" + }, + "frameworks": { + "netstandard1.0": {} + }, + "scripts": {} +} From 40bf17900a7c692733e3da3dd684b45267c4b31e Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Sat, 4 Jun 2016 01:13:36 -0700 Subject: [PATCH 45/97] Add IndexedArchive This type will archive multiple files de-duplicated in a zip with a central manifest that describes how to recreate the actual layout. In addition, any other zip file will be expanded and deduplicated so that we can further reduce the size of those zips/nupkgs. All of these are placed in a zip with no-compression, essentially using the zip as only a container. We then LZMA compress that container to achieve maximum compression. --- .../CompressionUtility.cs | 108 ++++ .../IndexedArchive.cs | 584 ++++++++++++++++++ .../ProgressReport.cs | 30 + .../ThreadLocalZipArchive.cs | 58 ++ src/Microsoft.DotNet.Archive/project.json | 7 +- 5 files changed, 786 insertions(+), 1 deletion(-) create mode 100644 src/Microsoft.DotNet.Archive/CompressionUtility.cs create mode 100644 src/Microsoft.DotNet.Archive/IndexedArchive.cs create mode 100644 src/Microsoft.DotNet.Archive/ProgressReport.cs create mode 100644 src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs diff --git a/src/Microsoft.DotNet.Archive/CompressionUtility.cs b/src/Microsoft.DotNet.Archive/CompressionUtility.cs new file mode 100644 index 000000000..143ce38c3 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/CompressionUtility.cs @@ -0,0 +1,108 @@ +using SevenZip; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Microsoft.DotNet.Archive +{ + internal static class CompressionUtility + { + enum MeasureBy + { + Input, + Output + } + + private class LzmaProgress : ICodeProgress + { + private IProgress progress; + private long totalSize; + private string phase; + private MeasureBy measureBy; + + public LzmaProgress(IProgress progress, string phase, long totalSize, MeasureBy measureBy) + { + this.progress = progress; + this.totalSize = totalSize; + this.phase = phase; + this.measureBy = measureBy; + } + + public void SetProgress(long inSize, long outSize) + { + progress.Report(phase, measureBy == MeasureBy.Input ? inSize : outSize, totalSize); + } + } + + public static void Compress(Stream inStream, Stream outStream, IProgress progress) + { + SevenZip.Compression.LZMA.Encoder encoder = new SevenZip.Compression.LZMA.Encoder(); + + CoderPropID[] propIDs = + { + CoderPropID.DictionarySize, + CoderPropID.PosStateBits, + CoderPropID.LitContextBits, + CoderPropID.LitPosBits, + CoderPropID.Algorithm, + CoderPropID.NumFastBytes, + CoderPropID.MatchFinder, + CoderPropID.EndMarker + }; + object[] properties = + { + (Int32)(1 << 26), + (Int32)(1), + (Int32)(8), + (Int32)(0), + (Int32)(2), + (Int32)(96), + "bt4", + false + }; + + encoder.SetCoderProperties(propIDs, properties); + encoder.WriteCoderProperties(outStream); + + Int64 inSize = inStream.Length; + for (int i = 0; i < 8; i++) + { + outStream.WriteByte((Byte)(inSize >> (8 * i))); + } + + var lzmaProgress = new LzmaProgress(progress, "Compressing", inSize, MeasureBy.Input); + lzmaProgress.SetProgress(0, 0); + encoder.Code(inStream, outStream, -1, -1, lzmaProgress); + lzmaProgress.SetProgress(inSize, outStream.Length); + } + + public static void Decompress(Stream inStream, Stream outStream, IProgress progress) + { + byte[] properties = new byte[5]; + + if (inStream.Read(properties, 0, 5) != 5) + throw (new Exception("input .lzma is too short")); + + SevenZip.Compression.LZMA.Decoder decoder = new SevenZip.Compression.LZMA.Decoder(); + decoder.SetDecoderProperties(properties); + + long outSize = 0; + for (int i = 0; i < 8; i++) + { + int v = inStream.ReadByte(); + if (v < 0) + throw (new Exception("Can't Read 1")); + outSize |= ((long)(byte)v) << (8 * i); + } + + long compressedSize = inStream.Length - inStream.Position; + var lzmaProgress = new LzmaProgress(progress, "Decompressing", outSize, MeasureBy.Output); + lzmaProgress.SetProgress(0, 0); + decoder.Code(inStream, outStream, compressedSize, outSize, lzmaProgress); + lzmaProgress.SetProgress(inStream.Length, outSize); + } + } +} diff --git a/src/Microsoft.DotNet.Archive/IndexedArchive.cs b/src/Microsoft.DotNet.Archive/IndexedArchive.cs new file mode 100644 index 000000000..30a85e8eb --- /dev/null +++ b/src/Microsoft.DotNet.Archive/IndexedArchive.cs @@ -0,0 +1,584 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.IO.Compression; +using System.Linq; +using System.Security.Cryptography; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Microsoft.DotNet.Archive +{ + public class IndexedArchive : IDisposable + { + private class DestinationFileInfo + { + public DestinationFileInfo(string destinationPath, string hash) + { + DestinationPath = destinationPath; + Hash = hash; + } + + public string DestinationPath { get; } + public string Hash { get; } + } + + private class ArchiveFileInfo + { + public ArchiveFileInfo(Stream stream, string archivePath, string hash) + { + Stream = stream; + ArchivePath = archivePath; + Hash = hash; + } + + public Stream Stream { get; set; } + public string ArchivePath { get; } + public string Hash { get; } + public string FileName { get { return Path.GetFileNameWithoutExtension(ArchivePath); } } + public string Extension { get { return Path.GetExtension(ArchivePath); } } + + public long Size { get { return Stream.Length; } } + + } + + static string[] ZipExtensions = new[] { ".zip", ".nupkg" }; + static string IndexFileName = "index.txt"; + + // maps file hash to archve path + // $ prefix indicates that the file is not in the archive and path is a hash + Dictionary archiveFiles = new Dictionary(); + // maps file hash to external path + Dictionary externalFiles = new Dictionary(); + // lists all extracted files & hashes + List destFiles = new List(); + bool disposed = false; + ThreadLocal sha = new ThreadLocal(() => SHA256.Create()); + + public IndexedArchive() + { + + } + + + private static Stream CreateTemporaryStream() + { + // return new MemoryStream(); + + string temp = Path.GetTempPath(); + string tempFile = Path.Combine(temp, Guid.NewGuid().ToString()); + return File.Create(tempFile, 4096, FileOptions.DeleteOnClose); + } + + private static FileStream CreateTemporaryFileStream() + { + string temp = Path.GetTempPath(); + string tempFile = Path.Combine(temp, Guid.NewGuid().ToString()); + //return File.Create(tempFile, 4096, FileOptions.DeleteOnClose); + return new FileStream(tempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.Read | FileShare.Delete, 4096, FileOptions.DeleteOnClose); + } + + public void Save(string archivePath, IProgress progress) + { + CheckDisposed(); + + //using (var archiveStream = CreateTemporaryStream()) + using (var archiveStream = File.Create(archivePath + ".zip")) + { + using (var archive = new ZipArchive(archiveStream, ZipArchiveMode.Create, true)) + { + BuildArchive(archive, progress); + } // close archive + + archiveStream.Seek(0, SeekOrigin.Begin); + + using (var lzmaStream = File.Create(archivePath)) + { + CompressionUtility.Compress(archiveStream, lzmaStream, progress); + } + } // close archiveStream + } + + private void BuildArchive(ZipArchive archive, IProgress progress) + { + // write the file index + var indexEntry = archive.CreateEntry(IndexFileName, CompressionLevel.NoCompression); + + using (var stream = indexEntry.Open()) + using (var textWriter = new StreamWriter(stream)) + { + foreach (var entry in destFiles) + { + var archiveFile = archiveFiles[entry.Hash]; + string archivePath = archiveFiles[entry.Hash].ArchivePath; + if (archiveFile.Stream == null) + { + archivePath = "$" + archivePath; + } + + textWriter.WriteLine($"{entry.DestinationPath}|{archivePath}"); + } + } + + // sort the files so that similar files are close together + var filesToArchive = archiveFiles.Values.ToList(); + filesToArchive.Sort((f1, f2) => + { + // first sort by extension + var comp = String.Compare(f1.Extension, f2.Extension, StringComparison.OrdinalIgnoreCase); + + if (comp == 0) + { + // then sort by filename + comp = String.Compare(f1.FileName, f2.FileName, StringComparison.OrdinalIgnoreCase); + } + + if (comp == 0) + { + // sort by file size (helps differentiate ref/lib/facade) + comp = f1.Size.CompareTo(f2.Size); + } + + if (comp == 0) + { + // finally sort by full archive path so we have stable output + comp = String.Compare(f1.ArchivePath, f2.ArchivePath, StringComparison.OrdinalIgnoreCase); + } + + return comp; + }); + + int filesAdded = 0; + // add all the files + foreach (var fileToArchive in filesToArchive) + { + var entry = archive.CreateEntry(fileToArchive.ArchivePath, CompressionLevel.NoCompression); + using (var entryStream = entry.Open()) + { + fileToArchive.Stream.CopyTo(entryStream); + fileToArchive.Stream.Dispose(); + fileToArchive.Stream = null; + } + + progress.Report("Archiving files", ++filesAdded, filesToArchive.Count); + } + } + + private abstract class ExtractOperation + { + public ExtractOperation(string destinationPath) + { + DestinationPath = destinationPath; + } + + public string DestinationPath { get; } + public virtual void DoOperation() + { + string directory = Path.GetDirectoryName(DestinationPath); + + if (!Directory.Exists(directory)) + { + Directory.CreateDirectory(directory); + } + + Execute(); + } + protected abstract void Execute(); + } + + private class CopyOperation : ExtractOperation + { + public CopyOperation(ExtractSource source, string destinationPath) : base(destinationPath) + { + Source = source; + } + public ExtractSource Source { get; } + protected override void Execute() + { + if (Source.LocalPath != null) + { + File.Copy(Source.LocalPath, DestinationPath, true); + } + else + { + using (var destinationStream = File.Create(DestinationPath)) + { + Source.CopyToStream(destinationStream); + } + } + } + } + + private class ZipOperation : ExtractOperation + { + public ZipOperation(string destinationPath) : base(destinationPath) + { + } + + private List> entries = new List>(); + + public void AddEntry(string entryName, ExtractSource source) + { + entries.Add(Tuple.Create(entryName, source)); + } + + protected override void Execute() + { + using (var archiveStream = File.Create(DestinationPath)) + using (var archive = new ZipArchive(archiveStream, ZipArchiveMode.Create)) + { + foreach(var zipSource in entries) + { + var entry = archive.CreateEntry(zipSource.Item1, CompressionLevel.Optimal); + using (var entryStream = entry.Open()) + { + zipSource.Item2.CopyToStream(entryStream); + } + } + } + } + } + + private class ExtractSource + { + private string _entryName; + private string _localPath; + private ThreadLocalZipArchive _archive; + + public ExtractSource(string sourceString, Dictionary externalFiles, ThreadLocalZipArchive archive) + { + if (sourceString[0] == '$') + { + var externalHash = sourceString.Substring(1); + if (!externalFiles.TryGetValue(externalHash, out _localPath)) + { + throw new Exception("Could not find external file with hash {externalHash}."); + } + } + else + { + _entryName = sourceString; + _archive = archive; + } + } + + public string LocalPath { get { return _localPath; } } + + public void CopyToStream(Stream destinationStream) + { + if (_localPath != null) + { + using (var sourceStream = File.OpenRead(_localPath)) + { + sourceStream.CopyTo(destinationStream); + } + } + else + { + // we open the archive each time since ZipArchive is not thread safe and we want to be able + // to extract from many threads + //using (var archive = new ZipArchive(File.Open(_archivePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete))) + using (var sourceStream = _archive.Archive.GetEntry(_entryName).Open()) + { + sourceStream.CopyTo(destinationStream); + + var destinationFileStream = destinationStream as FileStream; + if (destinationFileStream != null) + { + // Set Local path so that the next copy operation using the same source will + // do a copy instead of a write. + _localPath = destinationFileStream.Name; + } + } + } + + } + } + + private static char[] pipeSeperator = new[] { '|' }; + public void Extract(string compressedArchivePath, string outputDirectory, IProgress progress) + { + using (var archiveStream = CreateTemporaryFileStream()) + { + // decompress the LZMA stream + using (var lzmaStream = File.OpenRead(compressedArchivePath)) + { + CompressionUtility.Decompress(lzmaStream, archiveStream, progress); + } + + var archivePath = ((FileStream)archiveStream).Name; + + // reset the uncompressed stream + archiveStream.Seek(0, SeekOrigin.Begin); + + // read as a zip archive + using (var archive = new ZipArchive(archiveStream, ZipArchiveMode.Read)) + using (var tlArchive = new ThreadLocalZipArchive(archivePath, archive)) + { + List extractOperations = new List(); + Dictionary sourceCache = new Dictionary(); + + // process the index to determine all extraction operations + var indexEntry = archive.GetEntry(IndexFileName); + using (var indexReader = new StreamReader(indexEntry.Open())) + { + Dictionary zipOperations = new Dictionary(StringComparer.OrdinalIgnoreCase); + for (var line = indexReader.ReadLine(); line != null; line = indexReader.ReadLine()) + { + var lineParts = line.Split(pipeSeperator); + if (lineParts.Length != 2) + { + throw new Exception("Unexpected index line format, too many '|'s."); + } + + string target = lineParts[0]; + string source = lineParts[1]; + + ExtractSource extractSource; + if (!sourceCache.TryGetValue(source, out extractSource)) + { + sourceCache[source] = extractSource = new ExtractSource(source, externalFiles, tlArchive); + } + + var zipSeperatorIndex = target.IndexOf("::", StringComparison.OrdinalIgnoreCase); + + if (zipSeperatorIndex != -1) + { + string zipRelativePath = target.Substring(0, zipSeperatorIndex); + string zipEntryName = target.Substring(zipSeperatorIndex + 2); + string destinationPath = Path.Combine(outputDirectory, zipRelativePath); + + // operations on a zip file will be sequential + ZipOperation currentZipOperation; + + if (!zipOperations.TryGetValue(destinationPath, out currentZipOperation)) + { + extractOperations.Add(currentZipOperation = new ZipOperation(destinationPath)); + zipOperations.Add(destinationPath, currentZipOperation); + } + currentZipOperation.AddEntry(zipEntryName, extractSource); + } + else + { + string destinationPath = Path.Combine(outputDirectory, target); + extractOperations.Add(new CopyOperation(extractSource, destinationPath)); + } + } + } + + int opsExecuted = 0; + // execute all operations + //foreach(var extractOperation in extractOperations) + extractOperations.AsParallel().ForAll(extractOperation => + { + extractOperation.DoOperation(); + progress.Report("Expanding", Interlocked.Increment(ref opsExecuted), extractOperations.Count); + }); + } + } + } + + public void AddExternalDirectory(string externalDirectory) + { + CheckDisposed(); + foreach (var externalFile in Directory.EnumerateFiles(externalDirectory, "*", SearchOption.AllDirectories)) + { + AddExternalFile(externalFile); + } + } + + public void AddExternalFile(string externalFile) + { + CheckDisposed(); + using (var fs = File.OpenRead(externalFile)) + { + string hash = GetHash(fs); + // $ prefix indicates that the file is not in the archive and path is relative to an external directory + archiveFiles[hash] = new ArchiveFileInfo(null, "$" + hash , hash); + externalFiles[hash] = externalFile; + } + } + public void AddDirectory(string sourceDirectory, IProgress progress, string destinationDirectory = null) + { + var sourceFiles = Directory.EnumerateFiles(sourceDirectory, "*", SearchOption.AllDirectories).ToArray(); + int filesAdded = 0; + sourceFiles.AsParallel().ForAll(sourceFile => + { + string destinationPath = sourceFile.Substring(sourceDirectory.Length + 1); + + if (destinationDirectory != null) + { + destinationPath = Path.Combine(destinationDirectory, destinationPath); + } + + string extension = Path.GetExtension(sourceFile); + + if (ZipExtensions.Any(ze => ze.Equals(extension, StringComparison.OrdinalIgnoreCase))) + { + AddZip(sourceFile, destinationPath); + } + else + { + AddFile(sourceFile, destinationPath); + } + + progress.Report($"Adding {sourceDirectory}", ++filesAdded, sourceFiles.Length); + }); + } + + public void AddZip(string sourceZipFile, string destinationZipFile) + { + using (var sourceArchive = new ZipArchive(File.OpenRead(sourceZipFile), ZipArchiveMode.Read)) + { + foreach(var entry in sourceArchive.Entries) + { + // we can dispose this stream, if AddStream uses it, it will make a copy. + using (var stream = entry.Open()) + { + string destinationPath = $"{destinationZipFile}::{entry.FullName}"; + AddStream(stream, destinationPath); + } + } + } + } + + public void AddFile(string sourceFilePath, string destinationPath) + { + // lifetime of this stream is managed by AddStream + var stream = File.Open(sourceFilePath, FileMode.Open); + AddStream(stream, destinationPath); + } + + public void AddStream(Stream stream, string destinationPath) + { + CheckDisposed(); + + string hash = null; + + if (stream.CanSeek) + { + hash = GetHash(stream); + } + else + { + var copy = CreateTemporaryStream(); +#if NET45 + hash = CopyWithHash(stream, copy); +#else + stream.CopyTo(copy); + copy.Seek(0, SeekOrigin.Begin); + hash = GetHash(copy); +#endif + stream.Dispose(); + stream = copy; + } + + lock (archiveFiles) + { + destFiles.Add(new DestinationFileInfo(destinationPath, hash)); + + // see if we already have this file in the archive/external + ArchiveFileInfo existing = null; + if (archiveFiles.TryGetValue(hash, out existing)) + { + // reduce memory pressure + if (!(stream is MemoryStream) && (existing.Stream is MemoryStream)) + { + // dispose memory stream + existing.Stream.Dispose(); + stream.Seek(0, SeekOrigin.Begin); + existing.Stream = stream; + } + else + { + // we already have a good stream, free this one. + stream.Dispose(); + } + } + else + { + // add a new entry; + stream.Seek(0, SeekOrigin.Begin); + var archivePath = Path.Combine(hash, Path.GetFileName(destinationPath)); + + archiveFiles.Add(hash, new ArchiveFileInfo(stream, archivePath, hash)); + } + } + } + +#if NET45 + /// + /// Calculates the hash while copying the file to avoid multiple reads + /// + private const int _DefaultCopyBufferSize = 81920; + public string CopyWithHash(Stream source, Stream destination) + { + byte[] buffer = new byte[_DefaultCopyBufferSize]; + int read; + while ((read = source.Read(buffer, 0, buffer.Length)) != 0) + { + sha.Value.TransformBlock(buffer, 0, read, null, 0); + destination.Write(buffer, 0, read); + } + sha.Value.TransformFinalBlock(buffer, 0, 0); + var hash = sha.Value.Hash; + + // follow pattern in ComputeHash(stream) where it re-initializes after finishing. + sha.Value.Initialize(); + + return GetHashString(hash); + } +#endif + + + public string GetHash(Stream stream) + { + var hashBytes = sha.Value.ComputeHash(stream); + + return GetHashString(hashBytes); + } + + private static string GetHashString(byte[] hashBytes) + { + StringBuilder builder = new StringBuilder(hashBytes.Length * 2); + foreach (var b in hashBytes) + { + builder.AppendFormat("{0:x2}", b); + } + return builder.ToString(); + } + + public void Dispose() + { + if (!disposed) + { + if (archiveFiles != null) + { + foreach(var archiveFile in archiveFiles.Values) + { + if (archiveFile.Stream != null) + { + archiveFile.Stream.Dispose(); + archiveFile.Stream = null; + } + } + } + + if (sha != null) + { + sha.Dispose(); + sha = null; + } + } + } + + private void CheckDisposed() + { + if (disposed) + { + throw new ObjectDisposedException(nameof(IndexedArchive)); + } + } + } +} diff --git a/src/Microsoft.DotNet.Archive/ProgressReport.cs b/src/Microsoft.DotNet.Archive/ProgressReport.cs new file mode 100644 index 000000000..379378f88 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/ProgressReport.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Microsoft.DotNet.Archive +{ + public struct ProgressReport + { + public string Phase; + public long Ticks; + public long Total; + } + + public static class ProgressReportExtensions + { + public static void Report(this IProgress progress, string phase, long ticks, long total) + { + progress.Report(new ProgressReport() + { + Phase = phase, + Ticks = ticks, + Total = total + }); + } + } + +} diff --git a/src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs b/src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs new file mode 100644 index 000000000..9659e8a86 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.IO.Compression; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace Microsoft.DotNet.Archive +{ + // wraps ThreadLocal and exposes Dispose semantics that dispose all archives + class ThreadLocalZipArchive : IDisposable + { + private ThreadLocal _archive; + private bool disposed = false; + + public ThreadLocalZipArchive(string archivePath, ZipArchive local = null) + { + _archive = new ThreadLocal(() => + new ZipArchive(File.Open(archivePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete), ZipArchiveMode.Read), + trackAllValues:true); + + if (local != null) + { + // reuse provided one for current thread + _archive.Value = local; + } + } + + public ZipArchive Archive { get { return _archive.Value; } } + + public void Dispose() + { + if (!disposed) + { + if (_archive != null) + { + // dispose all archives + if (_archive.Values != null) + { + foreach (var value in _archive.Values) + { + if (value != null) + { + value.Dispose(); + } + } + } + + // dispose ThreadLocal + _archive.Dispose(); + _archive = null; + } + } + } + } +} diff --git a/src/Microsoft.DotNet.Archive/project.json b/src/Microsoft.DotNet.Archive/project.json index 7356ba390..0dec6c409 100644 --- a/src/Microsoft.DotNet.Archive/project.json +++ b/src/Microsoft.DotNet.Archive/project.json @@ -8,7 +8,12 @@ "NETStandard.Library": "1.6.0-rc3-24201-00" }, "frameworks": { - "netstandard1.0": {} + "net45": {}, + "netstandard1.3": { + "dependencies": { + "System.Linq.Parallel": "4.0.1-rc3-24201-00" + } + } }, "scripts": {} } From e34d988f546bade8d38082969236d3398b82ff64 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Sat, 4 Jun 2016 01:45:53 -0700 Subject: [PATCH 46/97] Clean up usings --- src/Microsoft.DotNet.Archive/CompressionUtility.cs | 4 ---- src/Microsoft.DotNet.Archive/IndexedArchive.cs | 1 - src/Microsoft.DotNet.Archive/ProgressReport.cs | 5 ----- src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs | 4 ---- 4 files changed, 14 deletions(-) diff --git a/src/Microsoft.DotNet.Archive/CompressionUtility.cs b/src/Microsoft.DotNet.Archive/CompressionUtility.cs index 143ce38c3..11deeb311 100644 --- a/src/Microsoft.DotNet.Archive/CompressionUtility.cs +++ b/src/Microsoft.DotNet.Archive/CompressionUtility.cs @@ -1,10 +1,6 @@ using SevenZip; using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Microsoft.DotNet.Archive { diff --git a/src/Microsoft.DotNet.Archive/IndexedArchive.cs b/src/Microsoft.DotNet.Archive/IndexedArchive.cs index 30a85e8eb..15706efba 100644 --- a/src/Microsoft.DotNet.Archive/IndexedArchive.cs +++ b/src/Microsoft.DotNet.Archive/IndexedArchive.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Security.Cryptography; using System.Text; using System.Threading; -using System.Threading.Tasks; namespace Microsoft.DotNet.Archive { diff --git a/src/Microsoft.DotNet.Archive/ProgressReport.cs b/src/Microsoft.DotNet.Archive/ProgressReport.cs index 379378f88..0a2622008 100644 --- a/src/Microsoft.DotNet.Archive/ProgressReport.cs +++ b/src/Microsoft.DotNet.Archive/ProgressReport.cs @@ -1,9 +1,4 @@ using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Microsoft.DotNet.Archive { diff --git a/src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs b/src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs index 9659e8a86..d7ed42120 100644 --- a/src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs +++ b/src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs @@ -1,11 +1,7 @@ using System; -using System.Collections.Generic; using System.IO; using System.IO.Compression; -using System.Linq; -using System.Text; using System.Threading; -using System.Threading.Tasks; namespace Microsoft.DotNet.Archive { From 4949cedcc2322132fb6f813963f2cc05a0146872 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Sat, 4 Jun 2016 01:46:09 -0700 Subject: [PATCH 47/97] Fix progress for decompression --- src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs index a9be39fc9..a94b7dd25 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs @@ -249,6 +249,7 @@ namespace SevenZip.Compression.LZMA } while (nowPos64 < outSize64) { + progress.SetProgress(inStream.Position, (long)nowPos64); // UInt64 next = Math.Min(nowPos64 + (1 << 18), outSize64); // while(nowPos64 < next) { From 8db7c1c4fb53fb3499474b45e03d94433ec8be37 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Sat, 4 Jun 2016 01:46:25 -0700 Subject: [PATCH 48/97] Add dotnet-archive application --- src/dotnet-archive/Program.cs | 151 ++++++++++++++++++++++++++++++++ src/dotnet-archive/project.json | 23 +++++ 2 files changed, 174 insertions(+) create mode 100644 src/dotnet-archive/Program.cs create mode 100644 src/dotnet-archive/project.json diff --git a/src/dotnet-archive/Program.cs b/src/dotnet-archive/Program.cs new file mode 100644 index 000000000..448aabaa8 --- /dev/null +++ b/src/dotnet-archive/Program.cs @@ -0,0 +1,151 @@ +using Microsoft.DotNet.Cli.CommandLine; +//using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Archive; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Reflection; + +namespace Microsoft.DotNet.Tools.Archive +{ + + public partial class ArchiveCommand + { + public static int Main(string[] args) + { + //DebugHelper.HandleDebugSwitch(ref args); + + var app = new CommandLineApplication(); + app.Name = "archive"; + app.FullName = ".NET archiver"; + app.Description = "Archives and expands sets of files"; + app.HelpOption("-h|--help"); + + var extract = app.Option("-x|--extract ", "Directory to extract to", CommandOptionType.SingleValue); + var archiveFile = app.Option("-a|--archive ", "Archive to operate on", CommandOptionType.SingleValue); + var externals = app.Option("--external ...", "External files and directories to consider for extraction", CommandOptionType.MultipleValue); + var sources = app.Argument("...", "Files & directory to include in the archive", multipleValues:true); + + var dotnetNew = new ArchiveCommand(); + app.OnExecute(() => { + + if (extract.HasValue() && sources.Values.Any()) + { + Console.WriteLine("Extract '-x' can only be specified when no '' are specified to add to the archive."); + return 1; + } + else if (!extract.HasValue() && !sources.Values.Any()) + { + Console.WriteLine("Either extract '-x' or '' must be specified."); + return 1; + } + + if (!archiveFile.HasValue()) + { + Console.WriteLine("Archive '-a' must be specified."); + return 1; + } + + var progress = new ConsoleProgressReport(); + + var archive = new IndexedArchive(); + foreach (var external in externals.Values) + { + if (Directory.Exists(external)) + { + archive.AddExternalDirectory(external); + } + else + { + archive.AddExternalFile(external); + } + } + + if (sources.Values.Any()) + { + foreach(var source in sources.Values) + { + if (Directory.Exists(source)) + { + archive.AddDirectory(source, progress); + } + else + { + archive.AddFile(source, Path.GetFileName(source)); + } + } + + archive.Save(archiveFile.Value(), progress); + } + else // extract.HasValue() + { + archive.Extract(archiveFile.Value(), extract.Value(), progress); + + } + + return 0; + }); + + try + { + return app.Execute(args); + } + catch (Exception ex) + { +#if DEBUG + //Reporter.Error.WriteLine(ex.ToString()); + Console.WriteLine(ex.ToString()); +#else + // Reporter.Error.WriteLine(ex.Message); + Console.WriteLine(ex.Message); +#endif + return 1; + } + } + + public class ConsoleProgressReport : IProgress + { + string currentPhase; + int lastLineLength = 0; + double lastProgress = -1; + Stopwatch stopwatch; + + public void Report(ProgressReport value) + { + long progress = (long)(100 * ((double)value.Ticks / value.Total)); + + if (progress == lastProgress && value.Phase == currentPhase) + { + return; + } + lastProgress = progress; + + lock (this) + { + string line = $"{value.Phase} {progress}%"; + if (value.Phase == currentPhase) + { + Console.Write(new string('\b', lastLineLength)); + + Console.Write(line); + lastLineLength = line.Length; + + if (progress == 100) + { + Console.WriteLine($" {stopwatch.ElapsedMilliseconds} ms"); + } + } + else + { + Console.Write(line); + currentPhase = value.Phase; + lastLineLength = line.Length; + stopwatch = Stopwatch.StartNew(); + } + } + } + } + } +} diff --git a/src/dotnet-archive/project.json b/src/dotnet-archive/project.json new file mode 100644 index 000000000..4a4dbfd4c --- /dev/null +++ b/src/dotnet-archive/project.json @@ -0,0 +1,23 @@ +{ + "buildOptions": { + "emitEntryPoint": true, + "compile": { + "include": [ + "**/*.cs", + "../dotnet/CommandLine/*.cs" + ] + } + }, + "dependencies": { + "Microsoft.DotNet.Archive": { + "target": "project" + }, + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc3-004391" + } + }, + "frameworks": { + "netcoreapp1.0": {} + } +} From ac2e21452f7123f8bc85cc8a4ea2c920dd07a3bc Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 6 Jun 2016 10:39:05 -0700 Subject: [PATCH 49/97] Adding a separate abstraction for the NuGet sentinel. --- .../DotnetFirstTimeUseConfigurer.cs | 23 ++-------- ...acheResolver.cs => INuGetCacheSentinel.cs} | 4 +- .../NuGetCacheResolver.cs | 15 ------ .../NuGetCacheSentinel.cs | 34 ++++++++++++++ .../GivenADotnetFirstTimeUseConfigurer.cs | 28 +++-------- .../GivenANuGetCacheSentinel.cs | 46 +++++++++++++++++++ 6 files changed, 92 insertions(+), 58 deletions(-) rename src/Microsoft.DotNet.Configurer/{INuGetCacheResolver.cs => INuGetCacheSentinel.cs} (75%) delete mode 100644 src/Microsoft.DotNet.Configurer/NuGetCacheResolver.cs create mode 100644 src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs create mode 100644 test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs diff --git a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs index d8fdd4cbd..e86f600aa 100644 --- a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs +++ b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs @@ -9,25 +9,13 @@ namespace Microsoft.DotNet.Configurer { public class DotnetFirstTimeUseConfigurer { - public static readonly string SENTINEL = $"{Product.Version}.dotnetSentinel"; - - private IFile _file; private INuGetCachePrimer _nugetCachePrimer; - private INuGetCacheResolver _nugetCacheResolver; + private INuGetCacheSentinel _nugetCacheSentinel; - public DotnetFirstTimeUseConfigurer(INuGetCachePrimer nugetCachePrimer, INuGetCacheResolver nugetCacheResolver) - : this(nugetCachePrimer, nugetCacheResolver, FileSystemWrapper.Default.File) + public DotnetFirstTimeUseConfigurer(INuGetCachePrimer nugetCachePrimer, INuGetCacheSentinel nugetCacheSentinel) { - } - - internal DotnetFirstTimeUseConfigurer( - INuGetCachePrimer nugetCachePrimer, - INuGetCacheResolver nugetCacheResolver, - IFile file) - { - _file = file; _nugetCachePrimer = nugetCachePrimer; - _nugetCacheResolver = nugetCacheResolver; + _nugetCacheSentinel = nugetCacheSentinel; } public void Configure() @@ -40,10 +28,7 @@ namespace Microsoft.DotNet.Configurer private bool ShouldPrimeNugetCache() { - var nugetCachePath = _nugetCacheResolver.ResolveNugetCachePath(); - var sentinel = Path.Combine(nugetCachePath, SENTINEL); - - return !_file.Exists(sentinel); + return !_nugetCacheSentinel.Exists(); } } } diff --git a/src/Microsoft.DotNet.Configurer/INuGetCacheResolver.cs b/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs similarity index 75% rename from src/Microsoft.DotNet.Configurer/INuGetCacheResolver.cs rename to src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs index 715762479..9c58cdd39 100644 --- a/src/Microsoft.DotNet.Configurer/INuGetCacheResolver.cs +++ b/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs @@ -3,8 +3,8 @@ namespace Microsoft.DotNet.Configurer { - public interface INuGetCacheResolver + public interface INuGetCacheSentinel { - string ResolveNugetCachePath(); + bool Exists(); } } \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/NuGetCacheResolver.cs b/src/Microsoft.DotNet.Configurer/NuGetCacheResolver.cs deleted file mode 100644 index 2a31e5d45..000000000 --- a/src/Microsoft.DotNet.Configurer/NuGetCacheResolver.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using Microsoft.DotNet.ProjectModel.Resolution; - -namespace Microsoft.DotNet.Configurer -{ - public class NuGetCacheResolver : INuGetCacheResolver - { - public string ResolveNugetCachePath() - { - return PackageDependencyProvider.ResolvePackagesPath(null, null); - } - } -} diff --git a/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs b/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs new file mode 100644 index 000000000..f1411f177 --- /dev/null +++ b/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs @@ -0,0 +1,34 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.IO; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.Extensions.EnvironmentAbstractions; +using Microsoft.DotNet.ProjectModel.Resolution; + +namespace Microsoft.DotNet.Configurer +{ + public class NuGetCacheSentinel : INuGetCacheSentinel + { + public static readonly string SENTINEL = $"{Product.Version}.dotnetSentinel"; + + private readonly IFile _file; + + public NuGetCacheSentinel() : this(FileSystemWrapper.Default.File) + { + } + + internal NuGetCacheSentinel(IFile file) + { + _file = file; + } + + public bool Exists() + { + var nugetCachePath = PackageDependencyProvider.ResolvePackagesPath(null, null); + var sentinel = Path.Combine(nugetCachePath, SENTINEL); + + return !_file.Exists(sentinel); + } + } +} diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs index 46f36f53d..2c5c85703 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs @@ -6,7 +6,6 @@ using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Configurer; using Microsoft.DotNet.Tools.Test; using Microsoft.Extensions.DependencyModel.Tests; -using Microsoft.Extensions.EnvironmentAbstractions; using Moq; using Xunit; @@ -14,36 +13,23 @@ namespace Microsoft.DotNet.Configurer.UnitTests { public class GivenADotnetFirstTimeUseConfigurer { - private const string NUGET_CACHE_PATH = "some path"; - private Mock _nugetCachePrimerMock; - private Mock _nugetCacheResolverMock; + private Mock _nugetCacheSentinelMock; public GivenADotnetFirstTimeUseConfigurer() { _nugetCachePrimerMock = new Mock(); - _nugetCacheResolverMock = new Mock(); - _nugetCacheResolverMock.Setup(n => n.ResolveNugetCachePath()).Returns(NUGET_CACHE_PATH); - } - - [Fact] - public void The_sentinel_has_the_current_version_in_its_name() - { - DotnetFirstTimeUseConfigurer.SENTINEL.Should().Contain($"{Product.Version}"); + _nugetCacheSentinelMock = new Mock(); } [Fact] public void It_does_not_prime_the_cache_if_the_sentinel_exists() { - var fileSystemMockBuilder = FileSystemMockBuilder.Create(); - fileSystemMockBuilder.AddFiles(NUGET_CACHE_PATH, DotnetFirstTimeUseConfigurer.SENTINEL); - - var fileSystemMock = fileSystemMockBuilder.Build(); + _nugetCacheSentinelMock.Setup(n => n.Exists()).Returns(true); var dotnetFirstTimeUseConfigurer = new DotnetFirstTimeUseConfigurer( _nugetCachePrimerMock.Object, - _nugetCacheResolverMock.Object, - fileSystemMock.File); + _nugetCacheSentinelMock.Object); dotnetFirstTimeUseConfigurer.Configure(); @@ -53,13 +39,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests [Fact] public void It_primes_the_cache_if_the_sentinel_does_not_exist() { - var fileSystemMockBuilder = FileSystemMockBuilder.Create(); - var fileSystemMock = fileSystemMockBuilder.Build(); + _nugetCacheSentinelMock.Setup(n => n.Exists()).Returns(false); var dotnetFirstTimeUseConfigurer = new DotnetFirstTimeUseConfigurer( _nugetCachePrimerMock.Object, - _nugetCacheResolverMock.Object, - fileSystemMock.File); + _nugetCacheSentinelMock.Object); dotnetFirstTimeUseConfigurer.Configure(); diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs new file mode 100644 index 000000000..d6a2fe9e0 --- /dev/null +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs @@ -0,0 +1,46 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using FluentAssertions; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Configurer; +using Microsoft.Extensions.DependencyModel.Tests; +using Xunit; + +namespace Microsoft.DotNet.Configurer.UnitTests +{ + public class GivenANuGetCacheSentinel + { + private const string NUGET_CACHE_PATH = "some path"; + + [Fact] + public void The_sentinel_has_the_current_version_in_its_name() + { + NuGetCacheSentinel.SENTINEL.Should().Contain($"{Product.Version}"); + } + + [Fact] + public void It_returns_true_if_the_sentinel_exists() + { + var fileSystemMockBuilder = FileSystemMockBuilder.Create(); + fileSystemMockBuilder.AddFiles(NUGET_CACHE_PATH, NuGetCacheSentinel.SENTINEL); + + var fileSystemMock = fileSystemMockBuilder.Build(); + + var nugetCacheSentinel = new NuGetCacheSentinel(fileSystemMock.File); + + nugetCacheSentinel.Exists().Should().BeTrue(); + } + + [Fact] + public void It_returns_false_if_the_sentinel_does_not_exist() + { + var fileSystemMockBuilder = FileSystemMockBuilder.Create(); + var fileSystemMock = fileSystemMockBuilder.Build(); + + var nugetCacheSentinel = new NuGetCacheSentinel(fileSystemMock.File); + + nugetCacheSentinel.Exists().Should().BeTrue(); + } + } +} From 461c26b78dd6dc79e7fa1a5d0968351cb9e9fca9 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 6 Jun 2016 12:51:27 -0700 Subject: [PATCH 50/97] Adding a create method to the sentinel and invoking it from the Primer when appropriate. --- .../INuGetCacheSentinel.cs | 2 + .../NuGetCachePrimer.cs | 25 +++++---- .../NuGetCacheSentinel.cs | 33 ++++++++++-- .../FileWrapper.cs | 6 +++ .../IFile.cs | 2 + .../GivenANuGetCachePrimer.cs | 30 ++++++++++- .../GivenANuGetCacheSentinel.cs | 51 ++++++++++++++++--- .../Mock/FileSystemMockBuilder.cs | 5 ++ 8 files changed, 131 insertions(+), 23 deletions(-) diff --git a/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs b/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs index 9c58cdd39..73d05f1fa 100644 --- a/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs +++ b/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs @@ -6,5 +6,7 @@ namespace Microsoft.DotNet.Configurer public interface INuGetCacheSentinel { bool Exists(); + + void CreateIfNotExists(); } } \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs index 9f41fc652..99a7e4696 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs @@ -14,20 +14,26 @@ namespace Microsoft.DotNet.Configurer private readonly ICommandFactory _commandFactory; private readonly IDirectory _directory; private readonly INuGetPackagesArchiver _nugetPackagesArchiver; + private readonly INuGetCacheSentinel _nuGetCacheSentinel; - public NuGetCachePrimer(ICommandFactory commandFactory, INuGetPackagesArchiver nugetPackagesArchiver) - : this(commandFactory, nugetPackagesArchiver, FileSystemWrapper.Default.Directory) + public NuGetCachePrimer( + ICommandFactory commandFactory, + INuGetPackagesArchiver nugetPackagesArchiver, + INuGetCacheSentinel nuGetCacheSentinel) + : this(commandFactory, nugetPackagesArchiver, nuGetCacheSentinel, FileSystemWrapper.Default.Directory) { } internal NuGetCachePrimer( ICommandFactory commandFactory, INuGetPackagesArchiver nugetPackagesArchiver, + INuGetCacheSentinel nuGetCacheSentinel, IDirectory directory) { _commandFactory = commandFactory; _directory = directory; _nugetPackagesArchiver = nugetPackagesArchiver; + _nuGetCacheSentinel = nuGetCacheSentinel; } public void PrimeCache() @@ -42,18 +48,17 @@ namespace Microsoft.DotNet.Configurer using (var temporaryDotnetNewDirectory = _directory.CreateTemporaryDirectory()) { var workingDirectory = temporaryDotnetNewDirectory.DirectoryPath; - var dotnetNewSucceeded = CreateTemporaryProject(workingDirectory); + var createProjectSucceeded = CreateTemporaryProject(workingDirectory); - if (dotnetNewSucceeded) + if (createProjectSucceeded) { - RestoreTemporaryProject(pathToPackagesArchive, workingDirectory); + var restoreProjectSucceeded = RestoreTemporaryProject(pathToPackagesArchive, workingDirectory); + if (restoreProjectSucceeded) + { + _nuGetCacheSentinel.CreateIfNotExists(); + } } } - // -- PrimeCache() - // (done) Create temporary project under a temporary folder using dotnet new - // (done) Restore that project using dotnet restore -s parameter pointing to the - // Create sentinel - // (done) Delete temporary folder (should be done automatically if using abstraction). } private bool CreateTemporaryProject(string workingDirectory) diff --git a/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs b/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs index f1411f177..982ac114c 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs @@ -14,21 +14,44 @@ namespace Microsoft.DotNet.Configurer private readonly IFile _file; - public NuGetCacheSentinel() : this(FileSystemWrapper.Default.File) + private string _nugetCachePath; + + private string NuGetCachePath + { + get + { + if (string.IsNullOrEmpty(_nugetCachePath)) + { + _nugetCachePath = PackageDependencyProvider.ResolvePackagesPath(null, null); + } + + return _nugetCachePath; + } + } + + private string Sentinel => Path.Combine(NuGetCachePath, SENTINEL); + + public NuGetCacheSentinel() : this(string.Empty, FileSystemWrapper.Default.File) { } - internal NuGetCacheSentinel(IFile file) + internal NuGetCacheSentinel(string nugetCachePath, IFile file) { _file = file; + _nugetCachePath = nugetCachePath; } public bool Exists() { - var nugetCachePath = PackageDependencyProvider.ResolvePackagesPath(null, null); - var sentinel = Path.Combine(nugetCachePath, SENTINEL); + return _file.Exists(Sentinel); + } - return !_file.Exists(sentinel); + public void CreateIfNotExists() + { + if (!Exists()) + { + _file.CreateEmptyFile(Sentinel); + } } } } diff --git a/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs b/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs index 867d4eab1..7e6ed7be7 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System; using System.IO; namespace Microsoft.Extensions.EnvironmentAbstractions @@ -21,5 +22,10 @@ namespace Microsoft.Extensions.EnvironmentAbstractions { return File.OpenRead(path); } + + public void CreateEmptyFile(string path) + { + File.Create(path).Dispose(); + } } } \ No newline at end of file diff --git a/src/Microsoft.DotNet.InternalAbstractions/IFile.cs b/src/Microsoft.DotNet.InternalAbstractions/IFile.cs index 5b0328de9..430c31b53 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/IFile.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/IFile.cs @@ -12,5 +12,7 @@ namespace Microsoft.Extensions.EnvironmentAbstractions string ReadAllText(string path); Stream OpenRead(string path); + + void CreateEmptyFile(string path); } } \ No newline at end of file diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs index 24ba95d99..a2fc796cb 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs @@ -26,6 +26,7 @@ namespace Microsoft.DotNet.Configurer.UnitTests private Mock _dotnetNewCommandMock; private Mock _dotnetRestoreCommandMock; private Mock _nugetPackagesArchiverMock; + private Mock _nugetCacheSentinel; public GivenANuGetCachePrimer() { @@ -39,9 +40,12 @@ namespace Microsoft.DotNet.Configurer.UnitTests _nugetPackagesArchiverMock = new Mock(); _nugetPackagesArchiverMock.Setup(n => n.ExtractArchive()).Returns(PACKAGES_ARCHIVE_PATH); + _nugetCacheSentinel = new Mock(); + var nugetCachePrimer = new NuGetCachePrimer( _commandFactoryMock.Object, _nugetPackagesArchiverMock.Object, + _nugetCacheSentinel.Object, _fileSystemMock.Directory); nugetCachePrimer.PrimeCache(); @@ -124,12 +128,13 @@ namespace Microsoft.DotNet.Configurer.UnitTests [Fact] public void It_does_not_run_restore_if_dotnet_new_fails() { - var commandFactoryMock = SetupCommandFactoryMock();; + var commandFactoryMock = SetupCommandFactoryMock(); _dotnetNewCommandMock.Setup(c => c.Execute()).Returns(new CommandResult(null, -1, null, null)); var nugetCachePrimer = new NuGetCachePrimer( commandFactoryMock.Object, _nugetPackagesArchiverMock.Object, + _nugetCacheSentinel.Object, _fileSystemMock.Directory); nugetCachePrimer.PrimeCache(); @@ -166,5 +171,28 @@ namespace Microsoft.DotNet.Configurer.UnitTests { _dotnetRestoreCommandMock.Verify(c => c.Execute(), Times.Once); } + + [Fact] + public void It_creates_a_sentinel_when_restore_succeeds() + { + _nugetCacheSentinel.Verify(n => n.CreateIfNotExists(), Times.Once); + } + + [Fact] + public void It_does_not_create_a_sentinel_when_restore_fails() + { + var nugetCacheSentinel = new Mock(); + _dotnetRestoreCommandMock.Setup(c => c.Execute()).Returns(new CommandResult(null, -1, null, null)); + + var nugetCachePrimer = new NuGetCachePrimer( + _commandFactoryMock.Object, + _nugetPackagesArchiverMock.Object, + nugetCacheSentinel.Object, + _fileSystemMock.Directory); + + nugetCachePrimer.PrimeCache(); + + nugetCacheSentinel.Verify(n => n.CreateIfNotExists(), Times.Never); + } } } diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs index d6a2fe9e0..4123bc5cb 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System.IO; using FluentAssertions; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Configurer; @@ -11,6 +12,13 @@ namespace Microsoft.DotNet.Configurer.UnitTests { public class GivenANuGetCacheSentinel { + private FileSystemMockBuilder _fileSystemMockBuilder; + + public GivenANuGetCacheSentinel() + { + _fileSystemMockBuilder = FileSystemMockBuilder.Create(); + } + private const string NUGET_CACHE_PATH = "some path"; [Fact] @@ -22,12 +30,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests [Fact] public void It_returns_true_if_the_sentinel_exists() { - var fileSystemMockBuilder = FileSystemMockBuilder.Create(); - fileSystemMockBuilder.AddFiles(NUGET_CACHE_PATH, NuGetCacheSentinel.SENTINEL); + _fileSystemMockBuilder.AddFiles(NUGET_CACHE_PATH, NuGetCacheSentinel.SENTINEL); - var fileSystemMock = fileSystemMockBuilder.Build(); + var fileSystemMock = _fileSystemMockBuilder.Build(); - var nugetCacheSentinel = new NuGetCacheSentinel(fileSystemMock.File); + var nugetCacheSentinel = new NuGetCacheSentinel(NUGET_CACHE_PATH, fileSystemMock.File); nugetCacheSentinel.Exists().Should().BeTrue(); } @@ -35,12 +42,42 @@ namespace Microsoft.DotNet.Configurer.UnitTests [Fact] public void It_returns_false_if_the_sentinel_does_not_exist() { - var fileSystemMockBuilder = FileSystemMockBuilder.Create(); - var fileSystemMock = fileSystemMockBuilder.Build(); + var fileSystemMock = _fileSystemMockBuilder.Build(); - var nugetCacheSentinel = new NuGetCacheSentinel(fileSystemMock.File); + var nugetCacheSentinel = new NuGetCacheSentinel(NUGET_CACHE_PATH, fileSystemMock.File); + + nugetCacheSentinel.Exists().Should().BeFalse(); + } + + [Fact] + public void It_creates_the_sentinel_in_the_nuget_cache_path_if_it_does_not_exist_already() + { + var fileSystemMock = _fileSystemMockBuilder.Build(); + var nugetCacheSentinel = new NuGetCacheSentinel(NUGET_CACHE_PATH, fileSystemMock.File); + + nugetCacheSentinel.Exists().Should().BeFalse(); + + nugetCacheSentinel.CreateIfNotExists(); nugetCacheSentinel.Exists().Should().BeTrue(); } + + [Fact] + public void It_does_not_create_the_sentinel_again_if_it_already_exists_in_the_nuget_cache_path() + { + const string contentToValidateSentinalWasNotReplaced = "some string"; + var sentinel = Path.Combine(NUGET_CACHE_PATH, NuGetCacheSentinel.SENTINEL); + _fileSystemMockBuilder.AddFile(sentinel, contentToValidateSentinalWasNotReplaced); + + var fileSystemMock = _fileSystemMockBuilder.Build(); + + var nugetCacheSentinel = new NuGetCacheSentinel(NUGET_CACHE_PATH, fileSystemMock.File); + + nugetCacheSentinel.Exists().Should().BeTrue(); + + nugetCacheSentinel.CreateIfNotExists(); + + fileSystemMock.File.ReadAllText(sentinel).Should().Be(contentToValidateSentinalWasNotReplaced); + } } } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs index b71485214..63ac9697b 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs @@ -84,6 +84,11 @@ namespace Microsoft.Extensions.DependencyModel.Tests { return new MemoryStream(Encoding.UTF8.GetBytes(ReadAllText(path))); } + + public void CreateEmptyFile(string path) + { + _files.Add(path, string.Empty); + } } private class DirectoryMock : IDirectory From 4c5f097d67d6bb3e1023b103dc0cfe52b6e49ed8 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 6 Jun 2016 15:41:14 -0700 Subject: [PATCH 51/97] Adding the configurer to dotnet. --- Microsoft.DotNet.Cli.sln | 19 +++++++++++++++++++ .../BuiltInCommand.cs | 6 ++++-- .../DotnetFirstTimeUseConfigurer.cs | 1 + .../NuGetCachePrimer.cs | 4 ++-- src/dotnet/Program.cs | 9 +++++++++ .../GivenANuGetCachePrimer.cs | 8 ++++---- 6 files changed, 39 insertions(+), 8 deletions(-) diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index 825c565be..eec268d1b 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -119,6 +119,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Configurer EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Configurer.UnitTests", "test\Microsoft.DotNet.Configurer.UnitTests\Microsoft.DotNet.Configurer.UnitTests.xproj", "{4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Archive", "src\Microsoft.DotNet.Archive\Microsoft.DotNet.Archive.xproj", "{35B19F22-B8C0-4849-9C35-3F809B7588B8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -883,6 +885,22 @@ Global {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.Debug|x64.ActiveCfg = Debug|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.Debug|x64.Build.0 = Debug|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.Release|Any CPU.Build.0 = Release|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.Release|x64.ActiveCfg = Release|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.Release|x64.Build.0 = Release|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {35B19F22-B8C0-4849-9C35-3F809B7588B8}.RelWithDebInfo|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -940,5 +958,6 @@ Global {5DF6C9DA-6909-4EC0-909E-6913580BB4A4} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {E5ED47EF-BF25-4DA9-A7FE-290C642CBF0F} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {4C3B06D5-B6D5-4E5B-A44F-3EBE52A1C759} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} + {35B19F22-B8C0-4849-9C35-3F809B7588B8} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} EndGlobalSection EndGlobal diff --git a/src/Microsoft.DotNet.Cli.Utils/BuiltInCommand.cs b/src/Microsoft.DotNet.Cli.Utils/BuiltInCommand.cs index 0f25e43c3..731713aa5 100644 --- a/src/Microsoft.DotNet.Cli.Utils/BuiltInCommand.cs +++ b/src/Microsoft.DotNet.Cli.Utils/BuiltInCommand.cs @@ -165,12 +165,14 @@ namespace Microsoft.DotNet.Cli.Utils public ICommand CaptureStdErr() { - throw new NotImplementedException(); + _stdErr.Capture(); + return this; } public ICommand CaptureStdOut() { - throw new NotImplementedException(); + _stdOut.Capture(); + return this; } public ICommand EnvironmentVariable(string name, string value) diff --git a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs index e86f600aa..41e3cf012 100644 --- a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs +++ b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs @@ -22,6 +22,7 @@ namespace Microsoft.DotNet.Configurer { if(ShouldPrimeNugetCache()) { + Reporter.Output.WriteLine("Configuring dotnet CLI for first time use."); _nugetCachePrimer.PrimeCache(); } } diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs index 99a7e4696..5d12671f7 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs @@ -63,13 +63,13 @@ namespace Microsoft.DotNet.Configurer private bool CreateTemporaryProject(string workingDirectory) { - return RunCommand("dotnet new", Enumerable.Empty(), workingDirectory); + return RunCommand("new", Enumerable.Empty(), workingDirectory); } private bool RestoreTemporaryProject(string pathToPackagesArchive, string workingDirectory) { return RunCommand( - "dotnet restore", + "restore", new[] {NUGET_SOURCE_PARAMETER, $"{pathToPackagesArchive}"}, workingDirectory); } diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index 07d3b4b7d..7ca1b9ce6 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Runtime.Loader; using System.Text; using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Configurer; using Microsoft.DotNet.InternalAbstractions; using Microsoft.DotNet.ProjectModel.Server; using Microsoft.DotNet.Tools.Build; @@ -56,6 +57,14 @@ namespace Microsoft.DotNet.Cli { using (PerfTrace.Current.CaptureTiming()) { + var nugetCacheSentinel = new NuGetCacheSentinel(); + var nugetPackagesArchiver = new NuGetPackagesArchiver(); + var commandFactory = new DotNetCommandFactory(); + var nugetCachePrimer = new NuGetCachePrimer(commandFactory, nugetPackagesArchiver, nugetCacheSentinel); + var dotnetConfigurer = new DotnetFirstTimeUseConfigurer(nugetCachePrimer, nugetCacheSentinel); + + dotnetConfigurer.Configure(); + return ProcessArgs(args, new Telemetry()); } } diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs index a2fc796cb..d20b1eaf4 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs @@ -58,14 +58,14 @@ namespace Microsoft.DotNet.Configurer.UnitTests _dotnetNewCommandMock = new Mock(); SetupCommandMock(_dotnetNewCommandMock); commandFactoryMock - .Setup(c => c.Create("dotnet new", Enumerable.Empty(), null, Constants.DefaultConfiguration)) + .Setup(c => c.Create("new", Enumerable.Empty(), null, Constants.DefaultConfiguration)) .Returns(_dotnetNewCommandMock.Object); _dotnetRestoreCommandMock = new Mock(); SetupCommandMock(_dotnetRestoreCommandMock); commandFactoryMock .Setup(c => c.Create( - "dotnet restore", + "restore", It.IsAny>(), null, Constants.DefaultConfiguration)) @@ -118,7 +118,7 @@ namespace Microsoft.DotNet.Configurer.UnitTests { _commandFactoryMock.Verify( c => c.Create( - "dotnet restore", + "restore", new [] {"-s", $"{PACKAGES_ARCHIVE_PATH}"}, null, Constants.DefaultConfiguration), @@ -141,7 +141,7 @@ namespace Microsoft.DotNet.Configurer.UnitTests commandFactoryMock.Verify( c => c.Create( - "dotnet restore", + "restore", It.IsAny>(), It.IsAny(), It.IsAny()), From 5f220a167747c1b2ee6513f1c9a3177b076931d7 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 8 Jun 2016 13:42:03 -0700 Subject: [PATCH 52/97] Generating the archive in the sdk folder of stage2. --- .../dotnet-cli-build/CompileTargets.cs | 102 ++++++++++++++++-- .../Utils/DotNetCli.cs | 1 + .../ConsoleProgressReport.cs | 51 +++++++++ src/dotnet-archive/Program.cs | 45 +------- tools/Archiver/project.json | 20 ++++ 5 files changed, 168 insertions(+), 51 deletions(-) create mode 100644 src/Microsoft.DotNet.Archive/ConsoleProgressReport.cs create mode 100644 tools/Archiver/project.json diff --git a/build_projects/dotnet-cli-build/CompileTargets.cs b/build_projects/dotnet-cli-build/CompileTargets.cs index 1c1b6332d..6ec05002c 100644 --- a/build_projects/dotnet-cli-build/CompileTargets.cs +++ b/build_projects/dotnet-cli-build/CompileTargets.cs @@ -107,14 +107,15 @@ namespace Microsoft.DotNet.Cli.Build } Directory.CreateDirectory(Dirs.Stage2); - var result = CompileCliSdk(c, + var result = CompileCliSdkAndGenerateNuGetPackagesArchive(c, dotnet: DotNetCli.Stage1, - rootOutputDirectory: Dirs.Stage2); + rootOutputDirectory: Dirs.Stage2, + currentDotnet: DotNetCli.Stage2); if (!result.Success) { return result; - } + } if (CurrentPlatform.IsWindows) { @@ -157,7 +158,26 @@ namespace Microsoft.DotNet.Cli.Build FS.RmFilesInDirRecursive(directory, "*.pdb"); } - private static BuildTargetResult CompileCliSdk(BuildTargetContext c, DotNetCli dotnet, string rootOutputDirectory) + private static BuildTargetResult CompileCliSdkAndGenerateNuGetPackagesArchive( + BuildTargetContext c, + DotNetCli dotnet, + string rootOutputDirectory, + DotNetCli currentDotnet) + { + var buildVersion = c.BuildContext.Get("BuildVersion"); + var sdkOutputDirectory = Path.Combine(rootOutputDirectory, "sdk", buildVersion.NuGetVersion); + + CompileCliSdk(c, dotnet, rootOutputDirectory); + + GenerateNuGetPackagesArchive(c, currentDotnet, sdkOutputDirectory); + + return c.Success(); + } + + private static BuildTargetResult CompileCliSdk( + BuildTargetContext c, + DotNetCli dotnet, + string rootOutputDirectory) { var configuration = c.BuildContext.Get("Configuration"); var buildVersion = c.BuildContext.Get("BuildVersion"); @@ -236,7 +256,7 @@ namespace Microsoft.DotNet.Cli.Build var sharedFrameworkNameVersionPath = SharedFrameworkPublisher.GetSharedFrameworkPublishPath( rootOutputDirectory, sharedFrameworkNugetVersion); - + // Copy Host to SDK Directory File.Copy( Path.Combine(sharedFrameworkNameVersionPath, HostArtifactNames.DotnetHostBaseName), @@ -250,7 +270,7 @@ namespace Microsoft.DotNet.Cli.Build Path.Combine(sharedFrameworkNameVersionPath, HostArtifactNames.HostPolicyBaseName), Path.Combine(sdkOutputDirectory, HostArtifactNames.HostPolicyBaseName), overwrite: true); - + CrossgenUtil.CrossgenDirectory( sharedFrameworkNameVersionPath, sdkOutputDirectory); @@ -258,9 +278,77 @@ namespace Microsoft.DotNet.Cli.Build // Generate .version file var version = buildVersion.NuGetVersion; var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}"; - File.WriteAllText(Path.Combine(sdkOutputDirectory, ".version"), content); + File.WriteAllText(Path.Combine(sdkOutputDirectory, ".version"), content); return c.Success(); + } + + private static void GenerateNuGetPackagesArchive( + BuildTargetContext c, + DotNetCli dotnet, + string sdkOutputDirectory) + { + var nuGetPackagesArchiveProject = Path.Combine(Dirs.Intermediate, "NuGetPackagesArchiveProject"); + var nuGetPackagesArchiveFolder = Path.Combine(Dirs.Intermediate, "nuGetPackagesArchiveFolder"); + + RestoreNuGetPackagesArchive(dotnet, nuGetPackagesArchiveProject, nuGetPackagesArchiveFolder); + + CompressNuGetPackagesArchive(c, dotnet, nuGetPackagesArchiveFolder, sdkOutputDirectory); + } + + private static void RestoreNuGetPackagesArchive( + DotNetCli dotnet, + string nuGetPackagesArchiveProject, + string nuGetPackagesArchiveFolder) + { + Rmdir(nuGetPackagesArchiveProject); + Mkdirp(nuGetPackagesArchiveProject); + + Rmdir(nuGetPackagesArchiveFolder); + Mkdirp(nuGetPackagesArchiveFolder); + + dotnet.New() + .WorkingDirectory(nuGetPackagesArchiveProject) + .Execute() + .EnsureSuccessful(); + + dotnet.Restore("--packages", nuGetPackagesArchiveFolder) + .WorkingDirectory(nuGetPackagesArchiveProject) + .Execute() + .EnsureSuccessful(); + } + + private static void CompressNuGetPackagesArchive( + BuildTargetContext c, + DotNetCli dotnet, + string nuGetPackagesArchiveFolder, + string sdkOutputDirectory) + { + var configuration = c.BuildContext.Get("Configuration"); + var archiver = Path.Combine(Dirs.Output, "tools", $"Archiver{Constants.ExeSuffix}"); + var intermediateArchive = Path.Combine(Dirs.Intermediate, "nuGetPackagesArchive.lzma"); + var finalArchive = Path.Combine(sdkOutputDirectory, "nuGetPackagesArchive.lzma"); + + Rm(intermediateArchive); + Rm($"{intermediateArchive}.zip"); + + c.Info("Publishing Archiver"); + dotnet.Publish("--output", Path.Combine(Dirs.Output, "tools"), "--configuration", configuration) + .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools", "Archiver")) + .Execute() + .EnsureSuccessful(); + + var packagesToArchive = new List { "-a", intermediateArchive }; + var nuGetPackagesArchiveDirectory = new DirectoryInfo(nuGetPackagesArchiveFolder); + foreach (var directory in nuGetPackagesArchiveDirectory.GetDirectories()) + { + packagesToArchive.Add(directory.FullName); + } + + Cmd(archiver, packagesToArchive) + .Execute(); + + File.Copy(intermediateArchive, finalArchive); } private static void RemoveAssetFromDepsPackages(string depsFile, string sectionName, string assetPath) diff --git a/build_projects/shared-build-targets-utils/Utils/DotNetCli.cs b/build_projects/shared-build-targets-utils/Utils/DotNetCli.cs index 2d9570388..82762ce56 100644 --- a/build_projects/shared-build-targets-utils/Utils/DotNetCli.cs +++ b/build_projects/shared-build-targets-utils/Utils/DotNetCli.cs @@ -38,6 +38,7 @@ namespace Microsoft.DotNet.Cli.Build public Command Pack(params string[] args) => Exec("pack", args); public Command Test(params string[] args) => Exec("test", args); public Command Publish(params string[] args) => Exec("publish", args); + public Command New(params string[] args) => Exec("new", args); public string GetRuntimeId() { diff --git a/src/Microsoft.DotNet.Archive/ConsoleProgressReport.cs b/src/Microsoft.DotNet.Archive/ConsoleProgressReport.cs new file mode 100644 index 000000000..a3e1b8a52 --- /dev/null +++ b/src/Microsoft.DotNet.Archive/ConsoleProgressReport.cs @@ -0,0 +1,51 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using System.Diagnostics; + +namespace Microsoft.DotNet.Archive +{ + public class ConsoleProgressReport : IProgress + { + string currentPhase; + int lastLineLength = 0; + double lastProgress = -1; + Stopwatch stopwatch; + + public void Report(ProgressReport value) + { + long progress = (long)(100 * ((double)value.Ticks / value.Total)); + + if (progress == lastProgress && value.Phase == currentPhase) + { + return; + } + lastProgress = progress; + + lock (this) + { + string line = $"{value.Phase} {progress}%"; + if (value.Phase == currentPhase) + { + Console.Write(new string('\b', lastLineLength)); + + Console.Write(line); + lastLineLength = line.Length; + + if (progress == 100) + { + Console.WriteLine($" {stopwatch.ElapsedMilliseconds} ms"); + } + } + else + { + Console.Write(line); + currentPhase = value.Phase; + lastLineLength = line.Length; + stopwatch = Stopwatch.StartNew(); + } + } + } + } +} \ No newline at end of file diff --git a/src/dotnet-archive/Program.cs b/src/dotnet-archive/Program.cs index 448aabaa8..5457c8c7f 100644 --- a/src/dotnet-archive/Program.cs +++ b/src/dotnet-archive/Program.cs @@ -103,49 +103,6 @@ namespace Microsoft.DotNet.Tools.Archive #endif return 1; } - } - - public class ConsoleProgressReport : IProgress - { - string currentPhase; - int lastLineLength = 0; - double lastProgress = -1; - Stopwatch stopwatch; - - public void Report(ProgressReport value) - { - long progress = (long)(100 * ((double)value.Ticks / value.Total)); - - if (progress == lastProgress && value.Phase == currentPhase) - { - return; - } - lastProgress = progress; - - lock (this) - { - string line = $"{value.Phase} {progress}%"; - if (value.Phase == currentPhase) - { - Console.Write(new string('\b', lastLineLength)); - - Console.Write(line); - lastLineLength = line.Length; - - if (progress == 100) - { - Console.WriteLine($" {stopwatch.ElapsedMilliseconds} ms"); - } - } - else - { - Console.Write(line); - currentPhase = value.Phase; - lastLineLength = line.Length; - stopwatch = Stopwatch.StartNew(); - } - } - } - } + } } } diff --git a/tools/Archiver/project.json b/tools/Archiver/project.json new file mode 100644 index 000000000..fa12a278d --- /dev/null +++ b/tools/Archiver/project.json @@ -0,0 +1,20 @@ +{ + "buildOptions": { + "emitEntryPoint": true, + "compile": { + "include": [ + "../../src/dotnet-archive/*.cs", + "../../src/dotnet/CommandLine/*.cs" + ] + } + }, + "dependencies": { + "Microsoft.DotNet.Archive": { + "target": "project" + }, + "Microsoft.NETCore.App": "1.0.0-rc3-004391" + }, + "frameworks": { + "netcoreapp1.0": {} + } +} From 69f43beccd9ca26634e39f274be67735e0291d3a Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 9 Jun 2016 20:52:49 -0700 Subject: [PATCH 53/97] Adding the code to extract the archive in the first use of dotnet an d added the first time use welcome text as well as some E2E tests. --- .../dotnet-cli-build/CompileTargets.cs | 13 +--- src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs | 2 + .../DotnetFirstTimeUseConfigurer.cs | 25 +++++- .../INuGetPackagesArchiver.cs | 8 +- .../NuGetCachePrimer.cs | 21 ++++- .../NuGetPackagesArchiver.cs | 40 +++++++--- src/Microsoft.DotNet.Configurer/project.json | 8 +- src/dotnet/Program.cs | 20 +++-- .../GivenANuGetCachePrimer.cs | 40 +++++++++- test/dotnet-publish.Tests/PublishTests.cs | 10 ++- ...hatTheUserIsRunningDoNetForTheFirstTime.cs | 77 +++++++++++++++++++ 11 files changed, 222 insertions(+), 42 deletions(-) create mode 100644 test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs diff --git a/build_projects/dotnet-cli-build/CompileTargets.cs b/build_projects/dotnet-cli-build/CompileTargets.cs index 6ec05002c..1519019ca 100644 --- a/build_projects/dotnet-cli-build/CompileTargets.cs +++ b/build_projects/dotnet-cli-build/CompileTargets.cs @@ -336,16 +336,11 @@ namespace Microsoft.DotNet.Cli.Build dotnet.Publish("--output", Path.Combine(Dirs.Output, "tools"), "--configuration", configuration) .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools", "Archiver")) .Execute() - .EnsureSuccessful(); + .EnsureSuccessful(); - var packagesToArchive = new List { "-a", intermediateArchive }; - var nuGetPackagesArchiveDirectory = new DirectoryInfo(nuGetPackagesArchiveFolder); - foreach (var directory in nuGetPackagesArchiveDirectory.GetDirectories()) - { - packagesToArchive.Add(directory.FullName); - } - - Cmd(archiver, packagesToArchive) + Cmd(archiver, + "-a", intermediateArchive, + nuGetPackagesArchiveFolder) .Execute(); File.Copy(intermediateArchive, finalArchive); diff --git a/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs b/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs index d55857038..9b7139464 100644 --- a/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs +++ b/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs @@ -15,6 +15,8 @@ namespace Microsoft.DotNet.Cli.Utils /// public static string VersionFile => Path.GetFullPath(Path.Combine(typeof(DotnetFiles).GetTypeInfo().Assembly.Location, "..", ".version")); + public static string NuGetPackagesArchive => Path.GetFullPath(Path.Combine(typeof(DotnetFiles).GetTypeInfo().Assembly.Location, "..", "nuGetPackagesArchive.lzma")); + /// /// Reads the version file and adds runtime specific information /// diff --git a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs index 41e3cf012..e67b10cd5 100644 --- a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs +++ b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs @@ -22,11 +22,34 @@ namespace Microsoft.DotNet.Configurer { if(ShouldPrimeNugetCache()) { - Reporter.Output.WriteLine("Configuring dotnet CLI for first time use."); + PrintFirstTimeUseNotice(); + _nugetCachePrimer.PrimeCache(); } } + private void PrintFirstTimeUseNotice() + { + Reporter.Output.WriteLine(); + Reporter.Output.WriteLine("Welcome to .NET Core!"); + Reporter.Output.WriteLine("---------------------"); + Reporter.Output.WriteLine("Learn more about .NET Core @ https://aka.ms/dotnet-docs. " + + "Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs."); + Reporter.Output.WriteLine("Telemetry"); + Reporter.Output.WriteLine("--------------"); + Reporter.Output.WriteLine("The .NET Core tools collect usage data in order to improve your experience. " + + "The data is anonymous and does not include commandline arguments. " + + "The data is collected by Microsoft and shared with the community."); + Reporter.Output.WriteLine(); + Reporter.Output.WriteLine("You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT " + + "environment variable to 1 using your favorite shell."); + Reporter.Output.WriteLine("You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry."); + Reporter.Output.WriteLine("Configuring..."); + Reporter.Output.WriteLine("-------------------"); + Reporter.Output.WriteLine("A command is running to initially populate your local package cache, to improve restore" + + "speed and enable offline access. This command will take up to a minute to complete and will only happen once."); + } + private bool ShouldPrimeNugetCache() { return !_nugetCacheSentinel.Exists(); diff --git a/src/Microsoft.DotNet.Configurer/INuGetPackagesArchiver.cs b/src/Microsoft.DotNet.Configurer/INuGetPackagesArchiver.cs index dfe784d60..4fc4b5291 100644 --- a/src/Microsoft.DotNet.Configurer/INuGetPackagesArchiver.cs +++ b/src/Microsoft.DotNet.Configurer/INuGetPackagesArchiver.cs @@ -1,10 +1,14 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System; + namespace Microsoft.DotNet.Configurer { - public interface INuGetPackagesArchiver + public interface INuGetPackagesArchiver : IDisposable { - string ExtractArchive(); + string NuGetPackagesArchive { get; } + + string ExtractArchive(); } } diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs index 5d12671f7..12f93b968 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs @@ -13,6 +13,7 @@ namespace Microsoft.DotNet.Configurer private const string NUGET_SOURCE_PARAMETER = "-s"; private readonly ICommandFactory _commandFactory; private readonly IDirectory _directory; + private readonly IFile _file; private readonly INuGetPackagesArchiver _nugetPackagesArchiver; private readonly INuGetCacheSentinel _nuGetCacheSentinel; @@ -20,7 +21,11 @@ namespace Microsoft.DotNet.Configurer ICommandFactory commandFactory, INuGetPackagesArchiver nugetPackagesArchiver, INuGetCacheSentinel nuGetCacheSentinel) - : this(commandFactory, nugetPackagesArchiver, nuGetCacheSentinel, FileSystemWrapper.Default.Directory) + : this(commandFactory, + nugetPackagesArchiver, + nuGetCacheSentinel, + FileSystemWrapper.Default.Directory, + FileSystemWrapper.Default.File) { } @@ -28,21 +33,33 @@ namespace Microsoft.DotNet.Configurer ICommandFactory commandFactory, INuGetPackagesArchiver nugetPackagesArchiver, INuGetCacheSentinel nuGetCacheSentinel, - IDirectory directory) + IDirectory directory, + IFile file) { _commandFactory = commandFactory; _directory = directory; _nugetPackagesArchiver = nugetPackagesArchiver; _nuGetCacheSentinel = nuGetCacheSentinel; + _file = file; } public void PrimeCache() { + if(SkipPrimingTheCache()) + { + return; + } + var pathToPackagesArchive = _nugetPackagesArchiver.ExtractArchive(); PrimeCacheUsingArchive(pathToPackagesArchive); } + private bool SkipPrimingTheCache() + { + return !_file.Exists(_nugetPackagesArchiver.NuGetPackagesArchive); + } + private void PrimeCacheUsingArchive(string pathToPackagesArchive) { using (var temporaryDotnetNewDirectory = _directory.CreateTemporaryDirectory()) diff --git a/src/Microsoft.DotNet.Configurer/NuGetPackagesArchiver.cs b/src/Microsoft.DotNet.Configurer/NuGetPackagesArchiver.cs index 3c171fd15..64bc7554e 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetPackagesArchiver.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetPackagesArchiver.cs @@ -1,20 +1,40 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Archive; +using Microsoft.Extensions.EnvironmentAbstractions; + namespace Microsoft.DotNet.Configurer { public class NuGetPackagesArchiver : INuGetPackagesArchiver { - public string ExtractArchive() - { - // -- ExtractArchive - // find archive - // extract archive to temporary folder - // Path.GetTempPath(); - // Path.GetRandomFileName(); - // Consider putting this inside an abstraction that will delete the folder automatically once it is done. + private ITemporaryDirectory _temporaryDirectory; - return @"C:\Users\licavalc\git\temp\feed"; + public string NuGetPackagesArchive => DotnetFiles.NuGetPackagesArchive; + + public NuGetPackagesArchiver() : this(FileSystemWrapper.Default.Directory) + { } + + internal NuGetPackagesArchiver(IDirectory directory) + { + _temporaryDirectory = directory.CreateTemporaryDirectory(); + } + + public string ExtractArchive() + { + var progress = new ConsoleProgressReport(); + var archive = new IndexedArchive(); + + archive.Extract(NuGetPackagesArchive, _temporaryDirectory.DirectoryPath, progress); + + return _temporaryDirectory.DirectoryPath; + } + + public void Dispose() + { + _temporaryDirectory.Dispose(); + } } -} +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/project.json b/src/Microsoft.DotNet.Configurer/project.json index 8e7ad4709..cc3e093c3 100644 --- a/src/Microsoft.DotNet.Configurer/project.json +++ b/src/Microsoft.DotNet.Configurer/project.json @@ -13,14 +13,14 @@ }, "Microsoft.DotNet.ProjectModel": { "target": "project" + }, + "Microsoft.DotNet.Archive": { + "target": "project" } }, "frameworks": { - "netcoreapp1.0": { + "netstandard1.6": { "imports": [ - "dnxcore50", - "netstandardapp1.5", - "portable-net45+win8", "portable-net45+wp80+win8+wpa81+dnxcore50" ] } diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index 7ca1b9ce6..54863d2ad 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -57,13 +57,7 @@ namespace Microsoft.DotNet.Cli { using (PerfTrace.Current.CaptureTiming()) { - var nugetCacheSentinel = new NuGetCacheSentinel(); - var nugetPackagesArchiver = new NuGetPackagesArchiver(); - var commandFactory = new DotNetCommandFactory(); - var nugetCachePrimer = new NuGetCachePrimer(commandFactory, nugetPackagesArchiver, nugetCacheSentinel); - var dotnetConfigurer = new DotnetFirstTimeUseConfigurer(nugetCachePrimer, nugetCacheSentinel); - - dotnetConfigurer.Configure(); + ConfigureDotNetForFirstTimeUse(); return ProcessArgs(args, new Telemetry()); } @@ -166,6 +160,18 @@ namespace Microsoft.DotNet.Cli } + private static void ConfigureDotNetForFirstTimeUse() + { + using (var nugetPackagesArchiver = new NuGetPackagesArchiver()) + { + var nugetCacheSentinel = new NuGetCacheSentinel(); + var commandFactory = new DotNetCommandFactory(); + var nugetCachePrimer = new NuGetCachePrimer(commandFactory, nugetPackagesArchiver, nugetCacheSentinel); + var dotnetConfigurer = new DotnetFirstTimeUseConfigurer(nugetCachePrimer, nugetCacheSentinel); + + dotnetConfigurer.Configure(); + } + } private static void InitializeProcess() { diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs index d20b1eaf4..4e0b81477 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs @@ -16,6 +16,7 @@ namespace Microsoft.DotNet.Configurer.UnitTests { public class GivenANuGetCachePrimer { + private const string COMPRESSED_ARCHIVE_PATH = "a path to somewhere"; private const string TEMPORARY_FOLDER_PATH = "some path"; private const string PACKAGES_ARCHIVE_PATH = "some other path"; @@ -32,6 +33,7 @@ namespace Microsoft.DotNet.Configurer.UnitTests { var fileSystemMockBuilder = FileSystemMockBuilder.Create(); fileSystemMockBuilder.TemporaryFolder = TEMPORARY_FOLDER_PATH; + fileSystemMockBuilder.AddFile(COMPRESSED_ARCHIVE_PATH); _fileSystemMock = fileSystemMockBuilder.Build(); _temporaryDirectoryMock = (ITemporaryDirectoryMock)_fileSystemMock.Directory.CreateTemporaryDirectory(); @@ -39,6 +41,7 @@ namespace Microsoft.DotNet.Configurer.UnitTests _nugetPackagesArchiverMock = new Mock(); _nugetPackagesArchiverMock.Setup(n => n.ExtractArchive()).Returns(PACKAGES_ARCHIVE_PATH); + _nugetPackagesArchiverMock.Setup(n => n.NuGetPackagesArchive).Returns(COMPRESSED_ARCHIVE_PATH); _nugetCacheSentinel = new Mock(); @@ -46,7 +49,8 @@ namespace Microsoft.DotNet.Configurer.UnitTests _commandFactoryMock.Object, _nugetPackagesArchiverMock.Object, _nugetCacheSentinel.Object, - _fileSystemMock.Directory); + _fileSystemMock.Directory, + _fileSystemMock.File); nugetCachePrimer.PrimeCache(); } @@ -83,6 +87,34 @@ namespace Microsoft.DotNet.Configurer.UnitTests commandMock.Setup(c => c.CaptureStdErr()).Returns(commandMock.Object); } + [Fact] + public void It_does_not_prime_the_NuGet_cache_if_the_archive_is_not_found_so_that_we_do_not_need_to_generate_the_archive_for_stage1() + { + var fileSystemMockBuilder = FileSystemMockBuilder.Create(); + var fileSystemMock = fileSystemMockBuilder.Build(); + + var commandFactoryMock = SetupCommandFactoryMock(); + + var nugetPackagesArchiverMock = new Mock(); + nugetPackagesArchiverMock.Setup(n => n.NuGetPackagesArchive).Returns(COMPRESSED_ARCHIVE_PATH); + + var nugetCachePrimer = new NuGetCachePrimer( + commandFactoryMock.Object, + nugetPackagesArchiverMock.Object, + _nugetCacheSentinel.Object, + fileSystemMock.Directory, + fileSystemMock.File); + + nugetCachePrimer.PrimeCache(); + + nugetPackagesArchiverMock.Verify(n => n.ExtractArchive(), Times.Never); + commandFactoryMock.Verify(c => c.Create( + It.IsAny(), + It.IsAny>(), + null, + Constants.DefaultConfiguration), Times.Never); + } + [Fact] public void It_disposes_the_temporary_directory_created_for_the_temporary_project_used_to_prime_the_cache() { @@ -135,7 +167,8 @@ namespace Microsoft.DotNet.Configurer.UnitTests commandFactoryMock.Object, _nugetPackagesArchiverMock.Object, _nugetCacheSentinel.Object, - _fileSystemMock.Directory); + _fileSystemMock.Directory, + _fileSystemMock.File); nugetCachePrimer.PrimeCache(); @@ -188,7 +221,8 @@ namespace Microsoft.DotNet.Configurer.UnitTests _commandFactoryMock.Object, _nugetPackagesArchiverMock.Object, nugetCacheSentinel.Object, - _fileSystemMock.Directory); + _fileSystemMock.Directory, + _fileSystemMock.File); nugetCachePrimer.PrimeCache(); diff --git a/test/dotnet-publish.Tests/PublishTests.cs b/test/dotnet-publish.Tests/PublishTests.cs index f23bdc6b6..924bad75b 100644 --- a/test/dotnet-publish.Tests/PublishTests.cs +++ b/test/dotnet-publish.Tests/PublishTests.cs @@ -142,15 +142,17 @@ namespace Microsoft.DotNet.Tools.Publish.Tests [Fact] public void CrossPublishingSucceedsAndHasExpectedArtifacts() - { - var testNugetCache = "packages_cross_publish_test"; + { TestInstance instance = TestAssetsManager.CreateTestInstance(Path.Combine("PortableTests")); - + var testProject = Path.Combine(instance.TestRoot, "StandaloneApp", "project.json"); + var workingDirectory = Path.GetDirectoryName(testProject); + var testNugetCache = Path.Combine(workingDirectory, "packages_cross_publish_test"); var restoreCommand = new RestoreCommand(); - restoreCommand.WorkingDirectory = Path.GetDirectoryName(testProject); + restoreCommand.WorkingDirectory = workingDirectory; + restoreCommand.Environment["NUGET_PACKAGES"] = testNugetCache; restoreCommand.Execute().Should().Pass(); diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs new file mode 100644 index 000000000..0a0487837 --- /dev/null +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs @@ -0,0 +1,77 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved.  +// Licensed under the MIT license. See LICENSE file in the project root for full license information.  + +using System; +using System.IO; +using System.Collections.Generic; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Cli; +using Microsoft.DotNet.TestFramework; +using Microsoft.DotNet.Tools.Test.Utilities; +using Xunit; +using FluentAssertions; + +namespace Microsoft.DotNet.Tests +{ + public class GivenThatTheUserIsRunningDotNetForTheFirstTime : TestBase + { + private static CommandResult _firstDotnetUseCommandResult; + private static DirectoryInfo _nugetCacheFolder; + + static GivenThatTheUserIsRunningDotNetForTheFirstTime() + { + var testDirectory = TestAssetsManager.CreateTestDirectory("Dotnet_first_time_experience_tests"); + var testNugetCache = Path.Combine(testDirectory.Path, "nuget_cache"); + + var command = new DotnetCommand() + .WithWorkingDirectory(testDirectory.Path); + command.Environment["NUGET_PACKAGES"] = testNugetCache; + + _firstDotnetUseCommandResult = command.ExecuteWithCapturedOutput("new"); + + _nugetCacheFolder = new DirectoryInfo(testNugetCache); + } + + [Fact] + public void Using_dotnet_for_the_first_time_succeeds() + { + _firstDotnetUseCommandResult.Should().Pass(); + } + + [Fact] + public void It_shows_the_appropriate_message_to_the_user() + { + const string firstTimeUseWelcomeMessage = @"Welcome to .NET Core! +--------------------- +Learn more about .NET Core @ https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. +Telemetry +-------------- +The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include commandline arguments. The data is collected by Microsoft and shared with the community. +You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. +You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. +Configuring... +------------------- +A command is running to initially populate your local package cache, to improve restorespeed and enable offline access. This command will take up to a minute to complete and will only happen once."; + + _firstDotnetUseCommandResult.StdOut.Should().StartWith(firstTimeUseWelcomeMessage); + } + + [Fact] + public void It_restores_the_nuget_packages_to_the_nuget_cache_folder() + { + _nugetCacheFolder.Should().HaveFile($"{GetDotnetVersion()}.dotnetSentinel"); + } + + [Fact] + public void It_creates_a_sentinel_file_under_the_nuget_cache_folder() + { + _nugetCacheFolder.Should().HaveDirectory("Microsoft.NETCore.App"); + } + + private string GetDotnetVersion() + { + return new DotnetCommand().ExecuteWithCapturedOutput("--version").StdOut + .TrimEnd(Environment.NewLine.ToCharArray()); + } + } +} \ No newline at end of file From f27330a09b3a4f2b6ddb99ebe30836c6b86ff9f5 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Tue, 31 May 2016 21:19:26 -0700 Subject: [PATCH 54/97] Revert "move all version suffixes to preview3 and rc4" This reverts commit 35432bcb4a32ddd6b672f86b206e2b1933eff035. --- branchinfo.txt | 2 +- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- src/Microsoft.DotNet.Compiler.Common/project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- src/Microsoft.DotNet.InternalAbstractions/project.json | 2 +- src/Microsoft.DotNet.ProjectModel.Loader/project.json | 2 +- src/Microsoft.DotNet.ProjectModel.Workspaces/project.json | 2 +- src/Microsoft.DotNet.ProjectModel/project.json | 2 +- src/Microsoft.DotNet.TestFramework/project.json | 2 +- src/Microsoft.Extensions.DependencyModel/project.json | 2 +- src/Microsoft.Extensions.Testing.Abstractions/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- src/dotnet/project.json | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/branchinfo.txt b/branchinfo.txt index ce86ccae5..ad298977a 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -4,6 +4,6 @@ MAJOR_VERSION=1 MINOR_VERSION=0 PATCH_VERSION=0 -RELEASE_SUFFIX=preview3 +RELEASE_SUFFIX=preview2 CHANNEL=preview BRANCH_NAME=rel/1.0.0-preview2 diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 59558d59f..ec97f914a 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview3-*", + "version": "1.0.0-preview2-*", "buildOptions": { "keyFile": "../../tools/Key.snk", "warningsAsErrors": true diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 579192f43..857b9115c 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview3-*", + "version": "1.0.0-preview2-*", "buildOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index d09565e2e..2757790c2 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview3-*", + "version": "1.0.0-preview2-*", "buildOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index 1e586c766..e229cd210 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -1,6 +1,6 @@ { "description": "Abstractions for making code that uses file system and environment testable.", - "version": "1.0.0-rc4-*", + "version": "1.0.0-rc3-*", "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 744a47487..5512c57c8 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview3-*", + "version": "1.0.0-preview2-*", "buildOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 40d4dea15..fda9fa0a1 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview3-*", + "version": "1.0.0-preview2-*", "buildOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 3075d1f6c..172393918 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-rc4-*", + "version": "1.0.0-rc3-*", "buildOptions": { "keyFile": "../../tools/Key.snk" }, diff --git a/src/Microsoft.DotNet.TestFramework/project.json b/src/Microsoft.DotNet.TestFramework/project.json index 76fc4473d..a4b1a4cbb 100644 --- a/src/Microsoft.DotNet.TestFramework/project.json +++ b/src/Microsoft.DotNet.TestFramework/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview3-*", + "version": "1.0.0-preview2-*", "description": "Microsoft.DotNet.TestFramework Class Library", "buildOptions": { "keyFile": "../../tools/Key.snk" diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index fa611fe1d..86f7145a4 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -1,6 +1,6 @@ { "description": "Abstractions for reading `.deps` files.", - "version": "1.0.0-rc4-*", + "version": "1.0.0-rc3-*", "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk" diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 33696e1c9..585ecc0a0 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -1,6 +1,6 @@ { "description": "Abstractions for test runners to communicate to a tool, such as Visual Studio.", - "version": "1.0.0-preview3-*", + "version": "1.0.0-preview2-*", "buildOptions": { "warningsAsErrors": true, "allowUnsafe": true, diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 53d87ed89..03ca1c2ca 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview3-*", + "version": "1.0.0-preview2-*", "buildOptions": { "emitEntryPoint": true, "compile": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index e3fd15ff8..81789c508 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-preview3-*", + "version": "1.0.0-preview2-*", "buildOptions": { "emitEntryPoint": true, "embed": { From bcadd6ff01cef7a9c64d98ed3a958372eabe6b8d Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 9 Jun 2016 21:08:55 -0700 Subject: [PATCH 55/97] Fixing identation and spaces in a few files. --- build_projects/dotnet-cli-build/CompileTargets.cs | 4 ++-- src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs | 8 ++++---- src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build_projects/dotnet-cli-build/CompileTargets.cs b/build_projects/dotnet-cli-build/CompileTargets.cs index 1519019ca..9d08a07ff 100644 --- a/build_projects/dotnet-cli-build/CompileTargets.cs +++ b/build_projects/dotnet-cli-build/CompileTargets.cs @@ -115,7 +115,7 @@ namespace Microsoft.DotNet.Cli.Build if (!result.Success) { return result; - } + } if (CurrentPlatform.IsWindows) { @@ -278,7 +278,7 @@ namespace Microsoft.DotNet.Cli.Build // Generate .version file var version = buildVersion.NuGetVersion; var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}"; - File.WriteAllText(Path.Combine(sdkOutputDirectory, ".version"), content); + File.WriteAllText(Path.Combine(sdkOutputDirectory, ".version"), content); return c.Success(); } diff --git a/src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs index 321e6fe8b..75c7dac5a 100644 --- a/src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs +++ b/src/Microsoft.DotNet.Configurer/INuGetCachePrimer.cs @@ -3,8 +3,8 @@ namespace Microsoft.DotNet.Configurer { - public interface INuGetCachePrimer - { - void PrimeCache(); - } + public interface INuGetCachePrimer + { + void PrimeCache(); + } } \ No newline at end of file diff --git a/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs b/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs index 73d05f1fa..2be2e1150 100644 --- a/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs +++ b/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs @@ -3,10 +3,10 @@ namespace Microsoft.DotNet.Configurer { - public interface INuGetCacheSentinel - { - bool Exists(); + public interface INuGetCacheSentinel + { + bool Exists(); - void CreateIfNotExists(); - } + void CreateIfNotExists(); + } } \ No newline at end of file From 4d631cc1b1c5cc8b7d7f9361a7ebb43ed26c7e6b Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Fri, 10 Jun 2016 12:35:32 -0700 Subject: [PATCH 56/97] Update dest path & fix race reporting progress Renaming destinationPath to destinationRelativePath for clarity. This string represents the path relative to the extract directory to which files will be written. We were missing an Interlocked.Increment during a parallel operation. --- src/Microsoft.DotNet.Archive/IndexedArchive.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.DotNet.Archive/IndexedArchive.cs b/src/Microsoft.DotNet.Archive/IndexedArchive.cs index 15706efba..caee1aac8 100644 --- a/src/Microsoft.DotNet.Archive/IndexedArchive.cs +++ b/src/Microsoft.DotNet.Archive/IndexedArchive.cs @@ -404,25 +404,26 @@ namespace Microsoft.DotNet.Archive int filesAdded = 0; sourceFiles.AsParallel().ForAll(sourceFile => { - string destinationPath = sourceFile.Substring(sourceDirectory.Length + 1); + // path relative to the destination/extracted directory to write the file + string destinationRelativePath = sourceFile.Substring(sourceDirectory.Length + 1); if (destinationDirectory != null) { - destinationPath = Path.Combine(destinationDirectory, destinationPath); + destinationRelativePath = Path.Combine(destinationDirectory, destinationRelativePath); } string extension = Path.GetExtension(sourceFile); if (ZipExtensions.Any(ze => ze.Equals(extension, StringComparison.OrdinalIgnoreCase))) { - AddZip(sourceFile, destinationPath); + AddZip(sourceFile, destinationRelativePath); } else { - AddFile(sourceFile, destinationPath); + AddFile(sourceFile, destinationRelativePath); } - progress.Report($"Adding {sourceDirectory}", ++filesAdded, sourceFiles.Length); + progress.Report($"Adding {sourceDirectory}", Interlocked.Increment(ref filesAdded), sourceFiles.Length); }); } From ed7e583ab6b0985ea1bc9e04e383935081e0f178 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 10 Jun 2016 13:02:48 -0700 Subject: [PATCH 57/97] Addressing code review comments and adding a DOTNET_SKIP_FIRST_TIME_EXPERIENCE env variable to have a way to turn off the feature. --- .../dotnet-cli-build/CompileTargets.cs | 25 +++++------ .../DotnetFirstTimeUseConfigurer.cs | 42 ++++++++++--------- .../NuGetCachePrimer.cs | 13 +++--- src/dotnet-archive/project.json | 2 +- src/dotnet/Program.cs | 26 ++++++++---- .../GivenADotnetFirstTimeUseConfigurer.cs | 30 ++++++++++++- .../project.json | 2 +- tools/Archiver/project.json | 2 +- 8 files changed, 91 insertions(+), 51 deletions(-) diff --git a/build_projects/dotnet-cli-build/CompileTargets.cs b/build_projects/dotnet-cli-build/CompileTargets.cs index 9d08a07ff..dbadac7b2 100644 --- a/build_projects/dotnet-cli-build/CompileTargets.cs +++ b/build_projects/dotnet-cli-build/CompileTargets.cs @@ -164,12 +164,7 @@ namespace Microsoft.DotNet.Cli.Build string rootOutputDirectory, DotNetCli currentDotnet) { - var buildVersion = c.BuildContext.Get("BuildVersion"); - var sdkOutputDirectory = Path.Combine(rootOutputDirectory, "sdk", buildVersion.NuGetVersion); - - CompileCliSdk(c, dotnet, rootOutputDirectory); - - GenerateNuGetPackagesArchive(c, currentDotnet, sdkOutputDirectory); + CompileCliSdk(c, dotnet, rootOutputDirectory, currentDotnet); return c.Success(); } @@ -177,7 +172,8 @@ namespace Microsoft.DotNet.Cli.Build private static BuildTargetResult CompileCliSdk( BuildTargetContext c, DotNetCli dotnet, - string rootOutputDirectory) + string rootOutputDirectory, + DotNetCli dotnetToGenerateNuGetPackagesArchive = null) { var configuration = c.BuildContext.Get("Configuration"); var buildVersion = c.BuildContext.Get("BuildVersion"); @@ -280,8 +276,13 @@ namespace Microsoft.DotNet.Cli.Build var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}"; File.WriteAllText(Path.Combine(sdkOutputDirectory, ".version"), content); + if(dotnetToGenerateNuGetPackagesArchive != null) + { + GenerateNuGetPackagesArchive(c, dotnetToGenerateNuGetPackagesArchive, sdkOutputDirectory); + } + return c.Success(); - } + } private static void GenerateNuGetPackagesArchive( BuildTargetContext c, @@ -325,7 +326,7 @@ namespace Microsoft.DotNet.Cli.Build string sdkOutputDirectory) { var configuration = c.BuildContext.Get("Configuration"); - var archiver = Path.Combine(Dirs.Output, "tools", $"Archiver{Constants.ExeSuffix}"); + var archiverExe = Path.Combine(Dirs.Output, "tools", $"Archiver{Constants.ExeSuffix}"); var intermediateArchive = Path.Combine(Dirs.Intermediate, "nuGetPackagesArchive.lzma"); var finalArchive = Path.Combine(sdkOutputDirectory, "nuGetPackagesArchive.lzma"); @@ -334,14 +335,14 @@ namespace Microsoft.DotNet.Cli.Build c.Info("Publishing Archiver"); dotnet.Publish("--output", Path.Combine(Dirs.Output, "tools"), "--configuration", configuration) - .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "tools", "Archiver")) + .WorkingDirectory(Path.Combine(Dirs.RepoRoot, "tools", "Archiver")) .Execute() .EnsureSuccessful(); - Cmd(archiver, + Cmd(archiverExe, "-a", intermediateArchive, nuGetPackagesArchiveFolder) - .Execute(); + .Execute(); File.Copy(intermediateArchive, finalArchive); } diff --git a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs index e67b10cd5..3b508a243 100644 --- a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs +++ b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs @@ -9,13 +9,18 @@ namespace Microsoft.DotNet.Configurer { public class DotnetFirstTimeUseConfigurer { + private IEnvironmentProvider _environmentProvider; private INuGetCachePrimer _nugetCachePrimer; private INuGetCacheSentinel _nugetCacheSentinel; - public DotnetFirstTimeUseConfigurer(INuGetCachePrimer nugetCachePrimer, INuGetCacheSentinel nugetCacheSentinel) + public DotnetFirstTimeUseConfigurer( + INuGetCachePrimer nugetCachePrimer, + INuGetCacheSentinel nugetCacheSentinel, + IEnvironmentProvider environmentProvider) { _nugetCachePrimer = nugetCachePrimer; _nugetCacheSentinel = nugetCacheSentinel; + _environmentProvider = environmentProvider; } public void Configure() @@ -30,29 +35,28 @@ namespace Microsoft.DotNet.Configurer private void PrintFirstTimeUseNotice() { + const string firstTimeUseWelcomeMessage = @"Welcome to .NET Core! +--------------------- +Learn more about .NET Core @ https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs. +Telemetry +-------------- +The .NET Core tools collect usage data in order to improve your experience. The data is anonymous and does not include commandline arguments. The data is collected by Microsoft and shared with the community. +You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environment variable to 1 using your favorite shell. +You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. +Configuring... +------------------- +A command is running to initially populate your local package cache, to improve restorespeed and enable offline access. This command will take up to a minute to complete and will only happen once."; + Reporter.Output.WriteLine(); - Reporter.Output.WriteLine("Welcome to .NET Core!"); - Reporter.Output.WriteLine("---------------------"); - Reporter.Output.WriteLine("Learn more about .NET Core @ https://aka.ms/dotnet-docs. " + - "Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs."); - Reporter.Output.WriteLine("Telemetry"); - Reporter.Output.WriteLine("--------------"); - Reporter.Output.WriteLine("The .NET Core tools collect usage data in order to improve your experience. " + - "The data is anonymous and does not include commandline arguments. " + - "The data is collected by Microsoft and shared with the community."); - Reporter.Output.WriteLine(); - Reporter.Output.WriteLine("You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT " + - "environment variable to 1 using your favorite shell."); - Reporter.Output.WriteLine("You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry."); - Reporter.Output.WriteLine("Configuring..."); - Reporter.Output.WriteLine("-------------------"); - Reporter.Output.WriteLine("A command is running to initially populate your local package cache, to improve restore" + - "speed and enable offline access. This command will take up to a minute to complete and will only happen once."); + Reporter.Output.WriteLine(firstTimeUseWelcomeMessage); } private bool ShouldPrimeNugetCache() { - return !_nugetCacheSentinel.Exists(); + var skipFirstTimeExperience = + _environmentProvider.GetEnvironmentVariableAsBool("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", false)); + + return !skipFirstTimeExperience && !_nugetCacheSentinel.Exists(); } } } diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs index 12f93b968..ae8ed84d5 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs @@ -50,9 +50,9 @@ namespace Microsoft.DotNet.Configurer return; } - var pathToPackagesArchive = _nugetPackagesArchiver.ExtractArchive(); + var extractedPackagesArchiveDirectory = _nugetPackagesArchiver.ExtractArchive(); - PrimeCacheUsingArchive(pathToPackagesArchive); + PrimeCacheUsingArchive(extractedPackagesArchiveDirectory); } private bool SkipPrimingTheCache() @@ -60,7 +60,7 @@ namespace Microsoft.DotNet.Configurer return !_file.Exists(_nugetPackagesArchiver.NuGetPackagesArchive); } - private void PrimeCacheUsingArchive(string pathToPackagesArchive) + private void PrimeCacheUsingArchive(string extractedPackagesArchiveDirectory) { using (var temporaryDotnetNewDirectory = _directory.CreateTemporaryDirectory()) { @@ -69,7 +69,8 @@ namespace Microsoft.DotNet.Configurer if (createProjectSucceeded) { - var restoreProjectSucceeded = RestoreTemporaryProject(pathToPackagesArchive, workingDirectory); + var restoreProjectSucceeded = + RestoreTemporaryProject(extractedPackagesArchiveDirectory, workingDirectory); if (restoreProjectSucceeded) { _nuGetCacheSentinel.CreateIfNotExists(); @@ -83,11 +84,11 @@ namespace Microsoft.DotNet.Configurer return RunCommand("new", Enumerable.Empty(), workingDirectory); } - private bool RestoreTemporaryProject(string pathToPackagesArchive, string workingDirectory) + private bool RestoreTemporaryProject(string extractedPackagesArchiveDirectory, string workingDirectory) { return RunCommand( "restore", - new[] {NUGET_SOURCE_PARAMETER, $"{pathToPackagesArchive}"}, + new[] {NUGET_SOURCE_PARAMETER, $"{extractedPackagesArchiveDirectory}"}, workingDirectory); } diff --git a/src/dotnet-archive/project.json b/src/dotnet-archive/project.json index 4a4dbfd4c..b4f4bcceb 100644 --- a/src/dotnet-archive/project.json +++ b/src/dotnet-archive/project.json @@ -14,7 +14,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004391" + "version": "1.0.0-rc3-004449-00" } }, "frameworks": { diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index 54863d2ad..47dd721ff 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -55,10 +55,10 @@ namespace Microsoft.DotNet.Cli try { + ConfigureDotNetForFirstTimeUse(); + using (PerfTrace.Current.CaptureTiming()) { - ConfigureDotNetForFirstTimeUse(); - return ProcessArgs(args, new Telemetry()); } } @@ -162,15 +162,23 @@ namespace Microsoft.DotNet.Cli private static void ConfigureDotNetForFirstTimeUse() { - using (var nugetPackagesArchiver = new NuGetPackagesArchiver()) + using (PerfTrace.Current.CaptureTiming()) { - var nugetCacheSentinel = new NuGetCacheSentinel(); - var commandFactory = new DotNetCommandFactory(); - var nugetCachePrimer = new NuGetCachePrimer(commandFactory, nugetPackagesArchiver, nugetCacheSentinel); - var dotnetConfigurer = new DotnetFirstTimeUseConfigurer(nugetCachePrimer, nugetCacheSentinel); + using (var nugetPackagesArchiver = new NuGetPackagesArchiver()) + { + var environmentProvider = new EnvironmentProvider(); + var nugetCacheSentinel = new NuGetCacheSentinel(); + var commandFactory = new DotNetCommandFactory(); + var nugetCachePrimer = + new NuGetCachePrimer(commandFactory, nugetPackagesArchiver, nugetCacheSentinel); + var dotnetConfigurer = new DotnetFirstTimeUseConfigurer( + nugetCachePrimer, + nugetCacheSentinel, + environmentProvider); - dotnetConfigurer.Configure(); - } + dotnetConfigurer.Configure(); + } + } } private static void InitializeProcess() diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs index 2c5c85703..37e21e2e5 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs @@ -15,11 +15,17 @@ namespace Microsoft.DotNet.Configurer.UnitTests { private Mock _nugetCachePrimerMock; private Mock _nugetCacheSentinelMock; + private Mock _environmentProviderMock; public GivenADotnetFirstTimeUseConfigurer() { _nugetCachePrimerMock = new Mock(); _nugetCacheSentinelMock = new Mock(); + _environmentProviderMock = new Mock(); + + _environmentProviderMock + .Setup(e => e.GetEnvironmentVariableAsBool("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", false)) + .Returns(false); } [Fact] @@ -29,7 +35,26 @@ namespace Microsoft.DotNet.Configurer.UnitTests var dotnetFirstTimeUseConfigurer = new DotnetFirstTimeUseConfigurer( _nugetCachePrimerMock.Object, - _nugetCacheSentinelMock.Object); + _nugetCacheSentinelMock.Object, + _environmentProviderMock.Object); + + dotnetFirstTimeUseConfigurer.Configure(); + + _nugetCachePrimerMock.Verify(r => r.PrimeCache(), Times.Never); + } + + [Fact] + public void It_does_not_prime_the_cache_if_the_sentinel_exists_but_the_user_has_set_the_DOTNET_SKIP_FIRST_TIME_EXPERIENCE_environemnt_variable() + { + _nugetCacheSentinelMock.Setup(n => n.Exists()).Returns(false); + _environmentProviderMock + .Setup(e => e.GetEnvironmentVariableAsBool("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", false)) + .Returns(true); + + var dotnetFirstTimeUseConfigurer = new DotnetFirstTimeUseConfigurer( + _nugetCachePrimerMock.Object, + _nugetCacheSentinelMock.Object, + _environmentProviderMock.Object); dotnetFirstTimeUseConfigurer.Configure(); @@ -43,7 +68,8 @@ namespace Microsoft.DotNet.Configurer.UnitTests var dotnetFirstTimeUseConfigurer = new DotnetFirstTimeUseConfigurer( _nugetCachePrimerMock.Object, - _nugetCacheSentinelMock.Object); + _nugetCacheSentinelMock.Object, + _environmentProviderMock.Object); dotnetFirstTimeUseConfigurer.Configure(); diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/project.json b/test/Microsoft.DotNet.Configurer.UnitTests/project.json index d876769f2..2eaaf6fa0 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/project.json +++ b/test/Microsoft.DotNet.Configurer.UnitTests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004363" + "version": "1.0.0-rc3-004442-00" }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24131-00", "Microsoft.DotNet.Configurer": { diff --git a/tools/Archiver/project.json b/tools/Archiver/project.json index fa12a278d..07db9fa6e 100644 --- a/tools/Archiver/project.json +++ b/tools/Archiver/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.Archive": { "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004391" + "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" }, "frameworks": { "netcoreapp1.0": {} From 105e5ab051b3352594955b6b955e2b6f4fca5f49 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 10 Jun 2016 15:06:48 -0700 Subject: [PATCH 58/97] Introducing a in progress sentinel that gets verified before running the first time experience. If we can get a handle for this sentinel, we proceed with the first time run, otherwise, it means there is a first time experience running already, in which case we continue running dotnet normally, even though the final (real) sentinel is not present yet. This prevents multiple dotnet commands from running the first time experience in parallel and prevents us from running into parallel nuget restores. --- src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs | 7 +- .../DotnetFirstTimeUseConfigurer.cs | 8 +- .../INuGetCacheSentinel.cs | 6 +- .../NuGetCachePrimer.cs | 3 +- .../NuGetCacheSentinel.cs | 50 +++++++- .../FileWrapper.cs | 21 +++- .../IFile.cs | 8 ++ src/dotnet/Program.cs | 22 ++-- .../GivenADotnetFirstTimeUseConfigurer.cs | 17 ++- .../GivenANuGetCacheSentinel.cs | 110 +++++++++++++++++- .../Mock/FileSystemMockBuilder.cs | 11 ++ ...hatTheUserIsRunningDoNetForTheFirstTime.cs | 2 +- 12 files changed, 240 insertions(+), 25 deletions(-) diff --git a/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs b/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs index 9b7139464..1ff66292e 100644 --- a/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs +++ b/src/Microsoft.DotNet.Cli.Utils/DotnetFiles.cs @@ -10,12 +10,15 @@ namespace Microsoft.DotNet.Cli.Utils { public static class DotnetFiles { + private static string SdkRootFolder => Path.Combine(typeof(DotnetFiles).GetTypeInfo().Assembly.Location, ".."); + /// /// The CLI ships with a .version file that stores the commit information and CLI version /// - public static string VersionFile => Path.GetFullPath(Path.Combine(typeof(DotnetFiles).GetTypeInfo().Assembly.Location, "..", ".version")); + public static string VersionFile => Path.GetFullPath(Path.Combine(SdkRootFolder, ".version")); - public static string NuGetPackagesArchive => Path.GetFullPath(Path.Combine(typeof(DotnetFiles).GetTypeInfo().Assembly.Location, "..", "nuGetPackagesArchive.lzma")); + public static string NuGetPackagesArchive => + Path.GetFullPath(Path.Combine(SdkRootFolder, "nuGetPackagesArchive.lzma")); /// /// Reads the version file and adds runtime specific information diff --git a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs index 3b508a243..c2bfa1784 100644 --- a/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs +++ b/src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs @@ -45,7 +45,7 @@ You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environmen You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. Configuring... ------------------- -A command is running to initially populate your local package cache, to improve restorespeed and enable offline access. This command will take up to a minute to complete and will only happen once."; +A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once."; Reporter.Output.WriteLine(); Reporter.Output.WriteLine(firstTimeUseWelcomeMessage); @@ -54,9 +54,11 @@ A command is running to initially populate your local package cache, to improve private bool ShouldPrimeNugetCache() { var skipFirstTimeExperience = - _environmentProvider.GetEnvironmentVariableAsBool("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", false)); + _environmentProvider.GetEnvironmentVariableAsBool("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", false); - return !skipFirstTimeExperience && !_nugetCacheSentinel.Exists(); + return !skipFirstTimeExperience && + !_nugetCacheSentinel.Exists() && + !_nugetCacheSentinel.InProgressSentinelAlreadyExists(); } } } diff --git a/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs b/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs index 2be2e1150..063f4c447 100644 --- a/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs +++ b/src/Microsoft.DotNet.Configurer/INuGetCacheSentinel.cs @@ -1,10 +1,14 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System; + namespace Microsoft.DotNet.Configurer { - public interface INuGetCacheSentinel + public interface INuGetCacheSentinel : IDisposable { + bool InProgressSentinelAlreadyExists(); + bool Exists(); void CreateIfNotExists(); diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs index ae8ed84d5..20b08d3b8 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs @@ -10,7 +10,6 @@ namespace Microsoft.DotNet.Configurer { public class NuGetCachePrimer : INuGetCachePrimer { - private const string NUGET_SOURCE_PARAMETER = "-s"; private readonly ICommandFactory _commandFactory; private readonly IDirectory _directory; private readonly IFile _file; @@ -88,7 +87,7 @@ namespace Microsoft.DotNet.Configurer { return RunCommand( "restore", - new[] {NUGET_SOURCE_PARAMETER, $"{extractedPackagesArchiveDirectory}"}, + new[] {"-s", $"{extractedPackagesArchiveDirectory}"}, workingDirectory); } diff --git a/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs b/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs index 982ac114c..8964a0d6c 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs @@ -11,6 +11,7 @@ namespace Microsoft.DotNet.Configurer public class NuGetCacheSentinel : INuGetCacheSentinel { public static readonly string SENTINEL = $"{Product.Version}.dotnetSentinel"; + public static readonly string INPROGRESS_SENTINEL = $"{Product.Version}.inprogress.dotnetSentinel"; private readonly IFile _file; @@ -29,7 +30,10 @@ namespace Microsoft.DotNet.Configurer } } - private string Sentinel => Path.Combine(NuGetCachePath, SENTINEL); + private string SentinelPath => Path.Combine(NuGetCachePath, SENTINEL); + private string InProgressSentinelPath => Path.Combine(NuGetCachePath, INPROGRESS_SENTINEL); + + private Stream InProgressSentinel { get; set; } public NuGetCacheSentinel() : this(string.Empty, FileSystemWrapper.Default.File) { @@ -39,18 +43,58 @@ namespace Microsoft.DotNet.Configurer { _file = file; _nugetCachePath = nugetCachePath; + + SetInProgressSentinel(); + } + + public bool InProgressSentinelAlreadyExists() + { + return CouldNotGetAHandleToTheInProgressSentinel(); } public bool Exists() { - return _file.Exists(Sentinel); + return _file.Exists(SentinelPath); } public void CreateIfNotExists() { if (!Exists()) { - _file.CreateEmptyFile(Sentinel); + _file.CreateEmptyFile(SentinelPath); + } + } + + private bool CouldNotGetAHandleToTheInProgressSentinel() + { + return InProgressSentinel == null; + } + + private void SetInProgressSentinel() + { + try + { + // open an exclusive handle to the in-progress sentinel and mark it for delete on close. + // we open with exclusive FileShare.None access to indicate that the operation is in progress. + // buffer size is minimum since we won't be reading or writing from the file. + // delete on close is to indicate that the operation is no longer in progress when we dispose + // this. + InProgressSentinel = _file.OpenFile( + InProgressSentinelPath, + FileMode.OpenOrCreate, + FileAccess.ReadWrite, + FileShare.None, + 1, + FileOptions.DeleteOnClose); + } + catch { } + } + + public void Dispose() + { + if (InProgressSentinel != null) + { + InProgressSentinel.Dispose(); } } } diff --git a/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs b/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs index 7e6ed7be7..01f579b84 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs @@ -23,9 +23,28 @@ namespace Microsoft.Extensions.EnvironmentAbstractions return File.OpenRead(path); } + public Stream OpenFile( + string path, + FileMode fileMode, + FileAccess fileAccess, + FileShare fileShare, + int bufferSize, + FileOptions fileOptions) + { + return new FileStream(path, fileMode, fileAccess, fileShare, bufferSize, fileOptions); + } + public void CreateEmptyFile(string path) { - File.Create(path).Dispose(); + try + { + var emptyFile = File.Create(path); + if (emptyFile != null) + { + emptyFile.Dispose(); + } + } + catch { } } } } \ No newline at end of file diff --git a/src/Microsoft.DotNet.InternalAbstractions/IFile.cs b/src/Microsoft.DotNet.InternalAbstractions/IFile.cs index 430c31b53..3e19c63f0 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/IFile.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/IFile.cs @@ -13,6 +13,14 @@ namespace Microsoft.Extensions.EnvironmentAbstractions Stream OpenRead(string path); + Stream OpenFile( + string path, + FileMode fileMode, + FileAccess fileAccess, + FileShare fileShare, + int bufferSize, + FileOptions fileOptions); + void CreateEmptyFile(string path); } } \ No newline at end of file diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs index 47dd721ff..7aeb94c89 100644 --- a/src/dotnet/Program.cs +++ b/src/dotnet/Program.cs @@ -166,17 +166,19 @@ namespace Microsoft.DotNet.Cli { using (var nugetPackagesArchiver = new NuGetPackagesArchiver()) { - var environmentProvider = new EnvironmentProvider(); - var nugetCacheSentinel = new NuGetCacheSentinel(); - var commandFactory = new DotNetCommandFactory(); - var nugetCachePrimer = - new NuGetCachePrimer(commandFactory, nugetPackagesArchiver, nugetCacheSentinel); - var dotnetConfigurer = new DotnetFirstTimeUseConfigurer( - nugetCachePrimer, - nugetCacheSentinel, - environmentProvider); + using (var nugetCacheSentinel = new NuGetCacheSentinel()) + { + var environmentProvider = new EnvironmentProvider(); + var commandFactory = new DotNetCommandFactory(); + var nugetCachePrimer = + new NuGetCachePrimer(commandFactory, nugetPackagesArchiver, nugetCacheSentinel); + var dotnetConfigurer = new DotnetFirstTimeUseConfigurer( + nugetCachePrimer, + nugetCacheSentinel, + environmentProvider); - dotnetConfigurer.Configure(); + dotnetConfigurer.Configure(); + } } } } diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs index 37e21e2e5..debfed58c 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs @@ -43,6 +43,21 @@ namespace Microsoft.DotNet.Configurer.UnitTests _nugetCachePrimerMock.Verify(r => r.PrimeCache(), Times.Never); } + [Fact] + public void It_does_not_prime_the_cache_if_first_run_experience_is_already_happening() + { + _nugetCacheSentinelMock.Setup(n => n.InProgressSentinelAlreadyExists()).Returns(true); + + var dotnetFirstTimeUseConfigurer = new DotnetFirstTimeUseConfigurer( + _nugetCachePrimerMock.Object, + _nugetCacheSentinelMock.Object, + _environmentProviderMock.Object); + + dotnetFirstTimeUseConfigurer.Configure(); + + _nugetCachePrimerMock.Verify(r => r.PrimeCache(), Times.Never); + } + [Fact] public void It_does_not_prime_the_cache_if_the_sentinel_exists_but_the_user_has_set_the_DOTNET_SKIP_FIRST_TIME_EXPERIENCE_environemnt_variable() { @@ -74,6 +89,6 @@ namespace Microsoft.DotNet.Configurer.UnitTests dotnetFirstTimeUseConfigurer.Configure(); _nugetCachePrimerMock.Verify(r => r.PrimeCache(), Times.Once); - } + } } } diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs index 4123bc5cb..3971462db 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs @@ -1,25 +1,68 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System; using System.IO; using FluentAssertions; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Configurer; using Microsoft.Extensions.DependencyModel.Tests; +using Microsoft.Extensions.EnvironmentAbstractions; using Xunit; namespace Microsoft.DotNet.Configurer.UnitTests { public class GivenANuGetCacheSentinel { + private const string NUGET_CACHE_PATH = "some path"; + private FileSystemMockBuilder _fileSystemMockBuilder; public GivenANuGetCacheSentinel() { _fileSystemMockBuilder = FileSystemMockBuilder.Create(); + } + + [Fact] + public void As_soon_as_it_gets_created_it_tries_to_get_handle_of_the_InProgress_sentinel() + { + var fileMock = new FileMock(); + var nugetCacheSentinel = new NuGetCacheSentinel(NUGET_CACHE_PATH, fileMock); + + fileMock.OpenFileWithRightParamsCalled.Should().BeTrue(); } - private const string NUGET_CACHE_PATH = "some path"; + [Fact] + public void It_returns_true_to_the_in_progress_sentinel_already_exists_when_it_fails_to_get_a_handle_to_it() + { + var fileMock = new FileMock(); + fileMock.InProgressSentinel = null; + var nugetCacheSentinel = new NuGetCacheSentinel(NUGET_CACHE_PATH, fileMock); + + nugetCacheSentinel.InProgressSentinelAlreadyExists().Should().BeTrue(); + } + + [Fact] + public void It_returns_false_to_the_in_progress_sentinel_already_exists_when_it_succeeds_in_getting_a_handle_to_it() + { + var fileMock = new FileMock(); + fileMock.InProgressSentinel = new MemoryStream(); + var nugetCacheSentinel = new NuGetCacheSentinel(NUGET_CACHE_PATH, fileMock); + + nugetCacheSentinel.InProgressSentinelAlreadyExists().Should().BeFalse(); + } + + [Fact] + public void It_disposes_of_the_handle_to_the_InProgressSentinel_when_NuGetCacheSentinel_is_disposed() + { + var mockStream = new MockStream(); + var fileMock = new FileMock(); + fileMock.InProgressSentinel = mockStream; + using (var nugetCacheSentinel = new NuGetCacheSentinel(NUGET_CACHE_PATH, fileMock)) + {} + + mockStream.IsDisposed.Should().BeTrue(); + } [Fact] public void The_sentinel_has_the_current_version_in_its_name() @@ -79,5 +122,70 @@ namespace Microsoft.DotNet.Configurer.UnitTests fileSystemMock.File.ReadAllText(sentinel).Should().Be(contentToValidateSentinalWasNotReplaced); } + + private class FileMock : IFile + { + public bool OpenFileWithRightParamsCalled { get; private set; } + + public Stream InProgressSentinel { get; set;} + + public bool Exists(string path) + { + throw new NotImplementedException(); + } + + public string ReadAllText(string path) + { + throw new NotImplementedException(); + } + + public Stream OpenRead(string path) + { + throw new NotImplementedException(); + } + + public Stream OpenFile( + string path, + FileMode fileMode, + FileAccess fileAccess, + FileShare fileShare, + int bufferSize, + FileOptions fileOptions) + { + Stream fileStream = null; + + var inProgressSentinel = + Path.Combine(GivenANuGetCacheSentinel.NUGET_CACHE_PATH, NuGetCacheSentinel.INPROGRESS_SENTINEL); + + if (path.Equals(inProgressSentinel) && + fileMode == FileMode.OpenOrCreate && + fileAccess == FileAccess.ReadWrite && + fileShare == FileShare.None && + bufferSize == 1 && + fileOptions == FileOptions.DeleteOnClose) + { + OpenFileWithRightParamsCalled = true; + fileStream = InProgressSentinel; + } + + return fileStream; + } + + public void CreateEmptyFile(string path) + { + throw new NotImplementedException(); + } + } + + private class MockStream : MemoryStream + { + public bool IsDisposed { get; private set;} + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + IsDisposed = true; + } + } } } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs index 63ac9697b..50537d20b 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs @@ -85,6 +85,17 @@ namespace Microsoft.Extensions.DependencyModel.Tests return new MemoryStream(Encoding.UTF8.GetBytes(ReadAllText(path))); } + public Stream OpenFile( + string path, + FileMode fileMode, + FileAccess fileAccess, + FileShare fileShare, + int bufferSize, + FileOptions fileOptions) + { + throw new NotImplementedException(); + } + public void CreateEmptyFile(string path) { _files.Add(path, string.Empty); diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs index 0a0487837..c08442d86 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs @@ -51,7 +51,7 @@ You can opt out of telemetry by setting a DOTNET_CLI_TELEMETRY_OPTOUT environmen You can read more about .NET Core tools telemetry @ https://aka.ms/dotnet-cli-telemetry. Configuring... ------------------- -A command is running to initially populate your local package cache, to improve restorespeed and enable offline access. This command will take up to a minute to complete and will only happen once."; +A command is running to initially populate your local package cache, to improve restore speed and enable offline access. This command will take up to a minute to complete and will only happen once."; _firstDotnetUseCommandResult.StdOut.Should().StartWith(firstTimeUseWelcomeMessage); } From 2b427bf7db1ff7d240c2e052e6b72dc68c862e0c Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Fri, 10 Jun 2016 16:18:42 -0700 Subject: [PATCH 59/97] Add copyright headers and cleanup Added copyright headers to all the 'dotnet' code and cleaned up to match repo style guidelines. --- .../CompressionUtility.cs | 5 +- .../ConsoleProgressReport.cs | 29 +++--- .../IndexedArchive.cs | 95 ++++++------------- .../ProgressReport.cs | 24 +++-- .../ThreadLocalZipArchive.cs | 15 ++- src/Microsoft.DotNet.Archive/project.json | 10 +- src/dotnet-archive/Program.cs | 8 +- 7 files changed, 82 insertions(+), 104 deletions(-) diff --git a/src/Microsoft.DotNet.Archive/CompressionUtility.cs b/src/Microsoft.DotNet.Archive/CompressionUtility.cs index 11deeb311..0b4e937dc 100644 --- a/src/Microsoft.DotNet.Archive/CompressionUtility.cs +++ b/src/Microsoft.DotNet.Archive/CompressionUtility.cs @@ -1,4 +1,7 @@ -using SevenZip; +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using SevenZip; using System; using System.IO; diff --git a/src/Microsoft.DotNet.Archive/ConsoleProgressReport.cs b/src/Microsoft.DotNet.Archive/ConsoleProgressReport.cs index a3e1b8a52..636e35970 100644 --- a/src/Microsoft.DotNet.Archive/ConsoleProgressReport.cs +++ b/src/Microsoft.DotNet.Archive/ConsoleProgressReport.cs @@ -8,42 +8,43 @@ namespace Microsoft.DotNet.Archive { public class ConsoleProgressReport : IProgress { - string currentPhase; - int lastLineLength = 0; - double lastProgress = -1; - Stopwatch stopwatch; + private string _currentPhase; + private int _lastLineLength = 0; + private double _lastProgress = -1; + private Stopwatch _stopwatch; + private object _stateLock = new object(); public void Report(ProgressReport value) { long progress = (long)(100 * ((double)value.Ticks / value.Total)); - if (progress == lastProgress && value.Phase == currentPhase) + if (progress == _lastProgress && value.Phase == _currentPhase) { return; } - lastProgress = progress; + _lastProgress = progress; - lock (this) + lock (_stateLock) { string line = $"{value.Phase} {progress}%"; - if (value.Phase == currentPhase) + if (value.Phase == _currentPhase) { - Console.Write(new string('\b', lastLineLength)); + Console.Write(new string('\b', _lastLineLength)); Console.Write(line); - lastLineLength = line.Length; + _lastLineLength = line.Length; if (progress == 100) { - Console.WriteLine($" {stopwatch.ElapsedMilliseconds} ms"); + Console.WriteLine($" {_stopwatch.ElapsedMilliseconds} ms"); } } else { Console.Write(line); - currentPhase = value.Phase; - lastLineLength = line.Length; - stopwatch = Stopwatch.StartNew(); + _currentPhase = value.Phase; + _lastLineLength = line.Length; + _stopwatch = Stopwatch.StartNew(); } } } diff --git a/src/Microsoft.DotNet.Archive/IndexedArchive.cs b/src/Microsoft.DotNet.Archive/IndexedArchive.cs index caee1aac8..6e5e81030 100644 --- a/src/Microsoft.DotNet.Archive/IndexedArchive.cs +++ b/src/Microsoft.DotNet.Archive/IndexedArchive.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; using System.Collections.Generic; using System.IO; using System.IO.Compression; @@ -47,24 +50,19 @@ namespace Microsoft.DotNet.Archive // maps file hash to archve path // $ prefix indicates that the file is not in the archive and path is a hash - Dictionary archiveFiles = new Dictionary(); + private Dictionary _archiveFiles = new Dictionary(); // maps file hash to external path - Dictionary externalFiles = new Dictionary(); + private Dictionary _externalFiles = new Dictionary(); // lists all extracted files & hashes - List destFiles = new List(); - bool disposed = false; - ThreadLocal sha = new ThreadLocal(() => SHA256.Create()); + private List _destFiles = new List(); + private bool _disposed = false; + private ThreadLocal _sha = new ThreadLocal(() => SHA256.Create()); public IndexedArchive() - { - - } - - + { } + private static Stream CreateTemporaryStream() { - // return new MemoryStream(); - string temp = Path.GetTempPath(); string tempFile = Path.Combine(temp, Guid.NewGuid().ToString()); return File.Create(tempFile, 4096, FileOptions.DeleteOnClose); @@ -74,7 +72,6 @@ namespace Microsoft.DotNet.Archive { string temp = Path.GetTempPath(); string tempFile = Path.Combine(temp, Guid.NewGuid().ToString()); - //return File.Create(tempFile, 4096, FileOptions.DeleteOnClose); return new FileStream(tempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.Read | FileShare.Delete, 4096, FileOptions.DeleteOnClose); } @@ -82,8 +79,7 @@ namespace Microsoft.DotNet.Archive { CheckDisposed(); - //using (var archiveStream = CreateTemporaryStream()) - using (var archiveStream = File.Create(archivePath + ".zip")) + using (var archiveStream = CreateTemporaryStream()) { using (var archive = new ZipArchive(archiveStream, ZipArchiveMode.Create, true)) { @@ -107,10 +103,10 @@ namespace Microsoft.DotNet.Archive using (var stream = indexEntry.Open()) using (var textWriter = new StreamWriter(stream)) { - foreach (var entry in destFiles) + foreach (var entry in _destFiles) { - var archiveFile = archiveFiles[entry.Hash]; - string archivePath = archiveFiles[entry.Hash].ArchivePath; + var archiveFile = _archiveFiles[entry.Hash]; + string archivePath = _archiveFiles[entry.Hash].ArchivePath; if (archiveFile.Stream == null) { archivePath = "$" + archivePath; @@ -121,7 +117,7 @@ namespace Microsoft.DotNet.Archive } // sort the files so that similar files are close together - var filesToArchive = archiveFiles.Values.ToList(); + var filesToArchive = _archiveFiles.Values.ToList(); filesToArchive.Sort((f1, f2) => { // first sort by extension @@ -337,7 +333,7 @@ namespace Microsoft.DotNet.Archive ExtractSource extractSource; if (!sourceCache.TryGetValue(source, out extractSource)) { - sourceCache[source] = extractSource = new ExtractSource(source, externalFiles, tlArchive); + sourceCache[source] = extractSource = new ExtractSource(source, _externalFiles, tlArchive); } var zipSeperatorIndex = target.IndexOf("::", StringComparison.OrdinalIgnoreCase); @@ -394,8 +390,8 @@ namespace Microsoft.DotNet.Archive { string hash = GetHash(fs); // $ prefix indicates that the file is not in the archive and path is relative to an external directory - archiveFiles[hash] = new ArchiveFileInfo(null, "$" + hash , hash); - externalFiles[hash] = externalFile; + _archiveFiles[hash] = new ArchiveFileInfo(null, "$" + hash , hash); + _externalFiles[hash] = externalFile; } } public void AddDirectory(string sourceDirectory, IProgress progress, string destinationDirectory = null) @@ -463,24 +459,20 @@ namespace Microsoft.DotNet.Archive else { var copy = CreateTemporaryStream(); -#if NET45 - hash = CopyWithHash(stream, copy); -#else stream.CopyTo(copy); copy.Seek(0, SeekOrigin.Begin); hash = GetHash(copy); -#endif stream.Dispose(); stream = copy; } - lock (archiveFiles) + lock (_archiveFiles) { - destFiles.Add(new DestinationFileInfo(destinationPath, hash)); + _destFiles.Add(new DestinationFileInfo(destinationPath, hash)); // see if we already have this file in the archive/external ArchiveFileInfo existing = null; - if (archiveFiles.TryGetValue(hash, out existing)) + if (_archiveFiles.TryGetValue(hash, out existing)) { // reduce memory pressure if (!(stream is MemoryStream) && (existing.Stream is MemoryStream)) @@ -502,39 +494,14 @@ namespace Microsoft.DotNet.Archive stream.Seek(0, SeekOrigin.Begin); var archivePath = Path.Combine(hash, Path.GetFileName(destinationPath)); - archiveFiles.Add(hash, new ArchiveFileInfo(stream, archivePath, hash)); + _archiveFiles.Add(hash, new ArchiveFileInfo(stream, archivePath, hash)); } } } -#if NET45 - /// - /// Calculates the hash while copying the file to avoid multiple reads - /// - private const int _DefaultCopyBufferSize = 81920; - public string CopyWithHash(Stream source, Stream destination) - { - byte[] buffer = new byte[_DefaultCopyBufferSize]; - int read; - while ((read = source.Read(buffer, 0, buffer.Length)) != 0) - { - sha.Value.TransformBlock(buffer, 0, read, null, 0); - destination.Write(buffer, 0, read); - } - sha.Value.TransformFinalBlock(buffer, 0, 0); - var hash = sha.Value.Hash; - - // follow pattern in ComputeHash(stream) where it re-initializes after finishing. - sha.Value.Initialize(); - - return GetHashString(hash); - } -#endif - - public string GetHash(Stream stream) { - var hashBytes = sha.Value.ComputeHash(stream); + var hashBytes = _sha.Value.ComputeHash(stream); return GetHashString(hashBytes); } @@ -551,11 +518,11 @@ namespace Microsoft.DotNet.Archive public void Dispose() { - if (!disposed) + if (!_disposed) { - if (archiveFiles != null) + if (_archiveFiles != null) { - foreach(var archiveFile in archiveFiles.Values) + foreach(var archiveFile in _archiveFiles.Values) { if (archiveFile.Stream != null) { @@ -565,17 +532,17 @@ namespace Microsoft.DotNet.Archive } } - if (sha != null) + if (_sha != null) { - sha.Dispose(); - sha = null; + _sha.Dispose(); + _sha = null; } } } private void CheckDisposed() { - if (disposed) + if (_disposed) { throw new ObjectDisposedException(nameof(IndexedArchive)); } diff --git a/src/Microsoft.DotNet.Archive/ProgressReport.cs b/src/Microsoft.DotNet.Archive/ProgressReport.cs index 0a2622008..6eb955563 100644 --- a/src/Microsoft.DotNet.Archive/ProgressReport.cs +++ b/src/Microsoft.DotNet.Archive/ProgressReport.cs @@ -1,24 +1,28 @@ -using System; +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; namespace Microsoft.DotNet.Archive { public struct ProgressReport { - public string Phase; - public long Ticks; - public long Total; + public ProgressReport(string phase, long ticks, long total) + { + Phase = phase; + Ticks = ticks; + Total = total; + } + public string Phase { get; } + public long Ticks { get; } + public long Total { get; } } public static class ProgressReportExtensions { public static void Report(this IProgress progress, string phase, long ticks, long total) { - progress.Report(new ProgressReport() - { - Phase = phase, - Ticks = ticks, - Total = total - }); + progress.Report(new ProgressReport(phase, ticks, total)); } } diff --git a/src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs b/src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs index d7ed42120..7f61207cb 100644 --- a/src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs +++ b/src/Microsoft.DotNet.Archive/ThreadLocalZipArchive.cs @@ -1,15 +1,20 @@ -using System; +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; using System.IO; using System.IO.Compression; using System.Threading; namespace Microsoft.DotNet.Archive { - // wraps ThreadLocal and exposes Dispose semantics that dispose all archives - class ThreadLocalZipArchive : IDisposable + /// + /// Wraps ThreadLocal and exposes Dispose semantics that dispose all archives + /// + internal class ThreadLocalZipArchive : IDisposable { private ThreadLocal _archive; - private bool disposed = false; + private bool _disposed = false; public ThreadLocalZipArchive(string archivePath, ZipArchive local = null) { @@ -28,7 +33,7 @@ namespace Microsoft.DotNet.Archive public void Dispose() { - if (!disposed) + if (!_disposed) { if (_archive != null) { diff --git a/src/Microsoft.DotNet.Archive/project.json b/src/Microsoft.DotNet.Archive/project.json index 0dec6c409..564b171cf 100644 --- a/src/Microsoft.DotNet.Archive/project.json +++ b/src/Microsoft.DotNet.Archive/project.json @@ -5,15 +5,11 @@ }, "description": "Archive and compression types.", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00" + "NETStandard.Library": "1.6.0-rc3-24201-00", + "System.Linq.Parallel": "4.0.1-rc3-24201-00" }, "frameworks": { - "net45": {}, - "netstandard1.3": { - "dependencies": { - "System.Linq.Parallel": "4.0.1-rc3-24201-00" - } - } + "netstandard1.3": {} }, "scripts": {} } diff --git a/src/dotnet-archive/Program.cs b/src/dotnet-archive/Program.cs index 5457c8c7f..0c8a1be39 100644 --- a/src/dotnet-archive/Program.cs +++ b/src/dotnet-archive/Program.cs @@ -1,4 +1,7 @@ -using Microsoft.DotNet.Cli.CommandLine; +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using Microsoft.DotNet.Cli.CommandLine; //using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Archive; using System; @@ -28,7 +31,6 @@ namespace Microsoft.DotNet.Tools.Archive var externals = app.Option("--external ...", "External files and directories to consider for extraction", CommandOptionType.MultipleValue); var sources = app.Argument("...", "Files & directory to include in the archive", multipleValues:true); - var dotnetNew = new ArchiveCommand(); app.OnExecute(() => { if (extract.HasValue() && sources.Values.Any()) @@ -79,7 +81,7 @@ namespace Microsoft.DotNet.Tools.Archive archive.Save(archiveFile.Value(), progress); } - else // extract.HasValue() + else // sources not specified, extract must have been specified { archive.Extract(archiveFile.Value(), extract.Value(), progress); From 762a259e9fcc358193f9ce94eef51f567b2f0668 Mon Sep 17 00:00:00 2001 From: Andrew Stanton-Nurse Date: Fri, 10 Jun 2016 17:28:23 -0700 Subject: [PATCH 60/97] fix #3469 by correcting overflow and enabling tests (#3471) * fix #3469 by correcting overflow and enabling tests * pr feedback --- build_projects/dotnet-cli-build/TestTargets.cs | 1 + .../LoaderProjectContextExtensions.cs | 4 ++-- .../ProjectLoadContextTest.cs | 13 +++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/build_projects/dotnet-cli-build/TestTargets.cs b/build_projects/dotnet-cli-build/TestTargets.cs index 4cbfe8239..9fc82b06a 100644 --- a/build_projects/dotnet-cli-build/TestTargets.cs +++ b/build_projects/dotnet-cli-build/TestTargets.cs @@ -39,6 +39,7 @@ namespace Microsoft.DotNet.Cli.Build "Microsoft.DotNet.Cli.Utils.Tests", "Microsoft.DotNet.Compiler.Common.Tests", "Microsoft.DotNet.ProjectModel.Tests", + "Microsoft.DotNet.ProjectModel.Loader.Tests", "Microsoft.Extensions.DependencyModel.Tests", "Performance" }; diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/LoaderProjectContextExtensions.cs b/src/Microsoft.DotNet.ProjectModel.Loader/LoaderProjectContextExtensions.cs index 401492aae..5dec13272 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/LoaderProjectContextExtensions.cs +++ b/src/Microsoft.DotNet.ProjectModel.Loader/LoaderProjectContextExtensions.cs @@ -20,7 +20,7 @@ namespace Microsoft.DotNet.ProjectModel.Loader public static AssemblyLoadContext CreateLoadContext( this ProjectContext context, string runtimeIdentifier, - string configuration) => CreateLoadContext(context, runtimeIdentifier, configuration); + string configuration) => CreateLoadContext(context, runtimeIdentifier, configuration, outputPath: null); public static AssemblyLoadContext CreateLoadContext( this ProjectContext context, @@ -124,4 +124,4 @@ namespace Microsoft.DotNet.ProjectModel.Loader } } } -} \ No newline at end of file +} diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/ProjectLoadContextTest.cs b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/ProjectLoadContextTest.cs index 1e3c562ea..0a2a2987b 100644 --- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/ProjectLoadContextTest.cs +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/ProjectLoadContextTest.cs @@ -13,20 +13,21 @@ namespace Microsoft.DotNet.ProjectModel.Loader.Tests [Fact] public void LoadContextCanLoadProjectOutput() { - var testInstance = TestAssetsManager.CreateTestInstance("TestProjectWithResource") + var testInstance = TestAssetsManager.CreateTestInstance("TestProjectWithCultureSpecificResource") .WithLockFiles() .WithBuildArtifacts(); - var rid = DependencyContext.Default.Target.Runtime; + var runtimeIdentifier = DependencyContext.Default.Target.Runtime; - var context = ProjectContext.Create(testInstance.TestRoot, NuGetFramework.Parse("netcoreapp1.0"), new[] { rid }); - var loadContext = context.CreateLoadContext(rid, Constants.DefaultConfiguration); + var context = ProjectContext.Create(testInstance.TestRoot, NuGetFramework.Parse("netcoreapp1.0"), new[] { runtimeIdentifier }); + var loadContext = context.CreateLoadContext(runtimeIdentifier, Constants.DefaultConfiguration); // Load the project assembly - var asm = loadContext.LoadFromAssemblyName(new AssemblyName("TestProjectWithResource")); + var assembly = loadContext.LoadFromAssemblyName(new AssemblyName("TestProjectWithCultureSpecificResource")); // Call Program.GetMessage() and assert the output - var message = (string)asm.GetType("TestProjectWithCultureSpecificResource").GetRuntimeMethod("GetMessage", Type.EmptyTypes).Invoke(null, new object[0]); + var type = assembly.GetType("TestProjectWithCultureSpecificResource.Program"); + var message = (string)type.GetRuntimeMethod("GetMessage", Type.EmptyTypes).Invoke(null, new object[0]); Assert.Equal("Hello World!" + Environment.NewLine + "Bonjour!", message); } } From d8c590e4ce961e28794f0326b5e1e5fe35835704 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 10 Jun 2016 18:17:32 -0700 Subject: [PATCH 61/97] When creating the handle to the in progress sentinel, it was failing because the nuget cache folder did not exist yet. Which translated to us understanding that a first time experience was already running. Now, before creating the handle, we check if the nuget folder exists, if it doesn't, we create it, instead of waiting for nuget to do that during restore. --- src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs b/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs index 8964a0d6c..a24a54418 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetCacheSentinel.cs @@ -74,6 +74,11 @@ namespace Microsoft.DotNet.Configurer { try { + if(!Directory.Exists(NuGetCachePath)) + { + Directory.CreateDirectory(NuGetCachePath); + } + // open an exclusive handle to the in-progress sentinel and mark it for delete on close. // we open with exclusive FileShare.None access to indicate that the operation is in progress. // buffer size is minimum since we won't be reading or writing from the file. From 686e09d5e9bed8ef05494205624eca2882c7255c Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 10 Jun 2016 19:52:37 -0700 Subject: [PATCH 62/97] Removed the CompileCliSdkAndGenerateNuGetPackagesArchive method from CompileTargets and replaced with CompileCliSDk. Also used stage1 to generate the archive for stage2. --- .../dotnet-cli-build/CompileTargets.cs | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/build_projects/dotnet-cli-build/CompileTargets.cs b/build_projects/dotnet-cli-build/CompileTargets.cs index dbadac7b2..bfe5255b1 100644 --- a/build_projects/dotnet-cli-build/CompileTargets.cs +++ b/build_projects/dotnet-cli-build/CompileTargets.cs @@ -107,10 +107,10 @@ namespace Microsoft.DotNet.Cli.Build } Directory.CreateDirectory(Dirs.Stage2); - var result = CompileCliSdkAndGenerateNuGetPackagesArchive(c, + var result = CompileCliSdk(c, dotnet: DotNetCli.Stage1, rootOutputDirectory: Dirs.Stage2, - currentDotnet: DotNetCli.Stage2); + generateNugetPackagesArchive: true); if (!result.Success) { @@ -158,22 +158,11 @@ namespace Microsoft.DotNet.Cli.Build FS.RmFilesInDirRecursive(directory, "*.pdb"); } - private static BuildTargetResult CompileCliSdkAndGenerateNuGetPackagesArchive( - BuildTargetContext c, - DotNetCli dotnet, - string rootOutputDirectory, - DotNetCli currentDotnet) - { - CompileCliSdk(c, dotnet, rootOutputDirectory, currentDotnet); - - return c.Success(); - } - private static BuildTargetResult CompileCliSdk( BuildTargetContext c, DotNetCli dotnet, string rootOutputDirectory, - DotNetCli dotnetToGenerateNuGetPackagesArchive = null) + bool generateNugetPackagesArchive = false) { var configuration = c.BuildContext.Get("Configuration"); var buildVersion = c.BuildContext.Get("BuildVersion"); @@ -276,9 +265,9 @@ namespace Microsoft.DotNet.Cli.Build var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}"; File.WriteAllText(Path.Combine(sdkOutputDirectory, ".version"), content); - if(dotnetToGenerateNuGetPackagesArchive != null) + if(generateNugetPackagesArchive) { - GenerateNuGetPackagesArchive(c, dotnetToGenerateNuGetPackagesArchive, sdkOutputDirectory); + GenerateNuGetPackagesArchive(c, dotnet, sdkOutputDirectory); } return c.Success(); From 2aa3dd0843e1886ef94406d80e484a0cb6aacf61 Mon Sep 17 00:00:00 2001 From: eerhardt Date: Sat, 11 Jun 2016 04:29:58 +0000 Subject: [PATCH 63/97] Updating CoreFx, CoreClr, Roslyn, CoreSetup to rc3-24210-10, rc3-24210-10, beta1-20160610-04, rc3-3004459-00 respectively --- .../project.json | 2 +- .../DesktopAppWithNativeDep/project.json | 2 +- .../KestrelDesktop/project.json | 2 +- .../KestrelDesktopForce32/project.json | 2 +- .../KestrelDesktopWithRuntimes/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../src/EmptyConsoleApp/project.json | 2 +- .../src/EmptyLibrary/project.json | 2 +- .../src/EmptyNetCoreApp/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../IncompatiblePackageSample/project.json | 2 +- .../src/Project1/project.json | 2 +- .../ToolWithOutputName/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../dotnet-desktop-and-portable/project.json | 2 +- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-portable/project.json | 2 +- .../TestApp1/project.json | 2 +- .../TestApp2/project.json | 2 +- .../AppWithBomGlobalJson/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithDirectDependency/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithNet46AndRoslyn/project.json | 2 +- .../AppWithOutputAssemblyName/project.json | 2 +- .../AppWithToolDependency/project.json | 2 +- .../TestProjects/CompileFail/project.json | 2 +- .../PortableApp_Standalone/project.json | 2 +- .../DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestAppDeps/project.json | 2 +- .../TestAppFullClr/project.json | 2 +- .../TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestProjects/EndToEndTestApp/project.json | 2 +- .../CompileFailApp/project.json | 2 +- .../FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../KestrelPortable/project.json | 2 +- .../KestrelStandalone/project.json | 2 +- .../project.json | 2 +- .../OutputStandardOutputAndError/project.json | 2 +- .../SingleTargetApp/project.json | 2 +- .../SingleTargetP0/project.json | 2 +- .../SingleTargetP1/project.json | 2 +- .../SingleTargetP2/project.json | 2 +- .../TwoTargetApp/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP0/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP1/project.json | 4 ++-- .../TwoTargetGraph/TwoTargetP2/project.json | 4 ++-- .../TwoTargetLargeP0/project.json | 6 +++--- .../TwoTargetLargeP1/project.json | 4 ++-- .../TwoTargetLargeP2/project.json | 4 ++-- .../TwoTargetLargeP3/project.json | 4 ++-- .../TwoTargetLargeP4/project.json | 4 ++-- .../TwoTargetLargeP5/project.json | 4 ++-- .../TwoTargetLargeP6/project.json | 4 ++-- .../PortableTests/PortableApp/project.json | 2 +- .../project.json | 4 ++-- .../PortableAppWithNative/project.json | 2 +- .../PortableTests/StandaloneApp/project.json | 2 +- .../MultipleFrameworkProject/project.json | 8 ++++---- .../NetCoreAppOnlyProject/project.json | 6 +++--- .../ResourcesTests/TestApp/project.json | 2 +- .../TestLibraryWithResources/project.json | 2 +- .../TestAppMultiTarget/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestProjects/TestAppSimple/project.json | 2 +- .../TestProjects/TestAppWithArgs/project.json | 2 +- .../App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestAppWithContentPackage/project.json | 2 +- .../TestAppWithContents/project.json | 2 +- .../TestAppWithLibrary/TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestAppWithResourceDeps/project.json | 12 +++++------ .../TestAppWithScripts/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../TestAppWithUnicodéPath/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../TestLibraryWithConfiguration/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../TestLibraryWithXmlDoc/project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 4 ++-- .../project.json | 6 +++--- .../TestMscorlibReference/project.json | 2 +- .../project.json | 2 +- .../src/L0/project.json | 2 +- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../project.json | 2 +- .../TestProjectWithResource/project.json | 2 +- .../TestLibraryWithRuleSet/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 2 +- .../TestSystemCoreReference/project.json | 2 +- .../TestSystemReference/project.json | 2 +- .../project.json | 6 +++--- .../dotnet-cli-build/CliDependencyVersions.cs | 4 ++-- build_projects/dotnet-cli-build/project.json | 14 ++++++------- .../DependencyVersions.cs | 4 ++-- .../shared-build-targets-utils/project.json | 12 +++++------ .../update-dependencies/project.json | 8 ++++---- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- .../project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 6 +++--- .../project.json | 4 ++-- src/compilers/project.json | 6 +++--- src/dotnet-compile-fsc/project.json | 2 +- .../CSharp_Console/project.json.template | 2 +- .../CSharp_xunittest/project.json.template | 4 ++-- .../FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 20 +++++++++---------- test/ArgumentForwardingTests/project.json | 4 ++-- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 4 ++-- test/Kestrel.Tests/project.json | 4 ++-- .../project.json | 6 +++--- .../project.json | 4 ++-- .../project.json | 2 +- .../project.json | 4 ++-- .../project.json | 4 ++-- test/Performance/project.json | 4 ++-- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 4 ++-- .../project.json | 6 +++--- .../TestAppWithFullPdbs/project.json | 2 +- .../TestAppWithPortablePdbs/project.json | 2 +- test/binding-redirects.Tests/project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 4 ++-- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 4 ++-- test/dotnet-compile.UnitTests/project.json | 4 ++-- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 6 +++--- .../project.json | 6 +++--- test/dotnet-publish.Tests/project.json | 6 +++--- test/dotnet-resgen.Tests/project.json | 4 ++-- test/dotnet-run.Tests/project.json | 4 ++-- test/dotnet-run.UnitTests/project.json | 4 ++-- test/dotnet-test.Tests/project.json | 8 ++++---- test/dotnet-test.UnitTests/project.json | 4 ++-- test/dotnet.Tests/project.json | 4 ++-- tools/MultiProjectValidator/project.json | 2 +- 168 files changed, 272 insertions(+), 272 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index a07adc28f..49096589b 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } }, "imports": [ diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json index 9b12dcdb5..498535ab2 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "PackageWithFakeNativeDep": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-06" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-10" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json index 777e408c5..f4c3018e7 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-06" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-10" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json index bccf6287a..b8193f98d 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-06" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-10" }, "buildOptions": { "platform": "anycpu32bitpreferred", diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json index dd994e5ba..e6fe889b6 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-06" + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-10" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json index ee4c1d872..ac8e9ead8 100644 --- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json @@ -9,7 +9,7 @@ "frameworks": { "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "imports": [ "portable-net45+win8", diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index cbbba9295..151db940e 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 26e4d7a7d..5c39bd3bb 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index ee30d4087..c2933f29c 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 8ec93433a..0b5806c34 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json @@ -5,7 +5,7 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index 5d23df488..32e0728ff 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index d4aeb27bc..f3c2a4d7d 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index df914c402..e5e563d22 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index bf267f20b..880385704 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index 6742eac6a..30ea24932 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index 22597e53e..2bd588d5b 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index 8fb758ec0..0163ecc6e 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index 30dec4f13..e76c58e56 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index ccc4a71e6..20f067b60 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index 5dc1c16d0..d5df4239a 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index d691cac2c..c176da7a8 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index 6bf4fed39..1932a9e97 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index d343434a6..e0e08326b 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index ab25a2470..90e613311 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index 4b0013bd9..3eedd3dcd 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004449-00", + "version": "1.0.0-rc3-004459-00", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 841e94893..101b6de99 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index a1802ac8c..a10d15456 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index 1e0d3bcc9..aa7f65e32 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004449-00", + "version": "1.0.0-rc3-004459-00", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index a022034f5..fa98be05a 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004449-00", + "version": "1.0.0-rc3-004459-00", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json index 6749079c0..66f5463c1 100644 --- a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json +++ b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160608-03" + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160610-04" }, "frameworks": { "net46": {} diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 24e11f111..86bdd1df0 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 13a5057ed..5548d4571 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 89dbcb1de..1d919006d 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index d343434a6..e0e08326b 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index c087c4267..1cd3f3add 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 1d58ff001..7ba4470b2 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -9,7 +9,7 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" } }, "net451": {} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 04aaa36ff..84e979c84 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index 482296f8b..22cc1852a 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json index fd503bb1f..a95eec9b1 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json @@ -7,7 +7,7 @@ "dependencies": { "DependencyContextValidator": "1.0.0-*", "System.Diagnostics.Process": { - "version": "4.1.0-rc3-24210-06", + "version": "4.1.0-rc3-24210-10", "type": "build" } }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 4950df988..4b2b86fd0 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index a4ac79c65..49ebd4a9c 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json index 48ba4b49f..cf0fde8fd 100644 --- a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json +++ b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json @@ -2,7 +2,7 @@ "version": "1.0.0", "dependencies": { "TestLibrary": "1.0.0", - "System.IO.Compression": "4.1.0-rc3-24210-06" + "System.IO.Compression": "4.1.0-rc3-24210-10" }, "frameworks": { "net461": {} diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index 770c7fefc..762034df4 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index 2d9c21710..f69d91bcf 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index c8ae8ba48..e0cfd5df5 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 5a8f429fa..33ffd4602 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index eec162232..5865cdf2e 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index 63ec8b322..1da519820 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index 5445a0afe..c2a38ff73 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index f5874f3a6..87000fe5f 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -3,7 +3,7 @@ "outputName": "MyLibrary" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 89dbcb1de..1d919006d 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index 5fe005e25..ad3934e3c 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index 520b85de2..fe7da3595 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index b7b0d3481..09a81077f 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 3e0a9dbb7..293f417ad 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index 630920451..dde335cd4 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,14 +9,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-01" + "NETStandard.Library": "1.6.0-rc3-24210-10", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 0e7ac97c5..796341b86 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-01" + "NETStandard.Library": "1.6.0-rc3-24210-10", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index 16f81f2d2..b6dd4956a 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index f33efd985..b2c7dfbd3 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 2ac2e734f..56c1af3c7 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-01" + "NETStandard.Library": "1.6.0-rc3-24210-10", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index 47c6a1351..d90035e80 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index 01a3ab055..db09f7fa5 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index ab3e5de77..8ac7aa597 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index 318ceae03..90235fad0 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index f33efd985..b2c7dfbd3 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index f33efd985..b2c7dfbd3 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index c70ff0f61..f40d0c096 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index 3c0812b47..a25cf4b09 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -4,14 +4,14 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160608-03" + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160610-04" }, "frameworks": { "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 648524f8d..095c58de8 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index 0f7bb7775..2f1b31240 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index 57bbc5d6c..aaec13eb5 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-06", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-10", "xunit": "2.1.0" }, "frameworks": { @@ -15,10 +15,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Linq.Expressions": "4.1.0-rc3-24210-06", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06" + "System.Linq.Expressions": "4.1.0-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10" } }, "net451": {} diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index bb053b862..5fcee9437 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Linq.Expressions": "4.1.0-rc3-24210-06", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Linq.Expressions": "4.1.0-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index c1ee3bf94..1e03be991 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json index 1e24d5607..23cd1da8e 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 5c77a7d68..5e796a431 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004449-00", + "version": "1.0.0-rc3-004459-00", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index 543997c35..c111e7f5d 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index a9ce784ba..29a9c0bde 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index 89dbcb1de..1d919006d 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 89dbcb1de..1d919006d 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index a768fb6b4..46e224cce 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index 58fe5781f..4014d737e 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index 62856b177..aa6098f61 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 4ef38578d..83d5bf240 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index e2216c724..2cce5e3d2 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index a9ce784ba..29a9c0bde 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index f7f5c620a..596cd8ec1 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,12 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", - "Microsoft.CSharp": "4.0.1-rc3-24210-06", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-06", - "System.Reflection.Metadata": "1.3.0-rc3-24210-06", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", - "System.Xml.XmlSerializer": "4.0.11-rc3-24210-06", + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", + "Microsoft.CSharp": "4.0.1-rc3-24210-10", + "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", + "System.Reflection.Metadata": "1.3.0-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Xml.XmlSerializer": "4.0.11-rc3-24210-10", "WindowsAzure.Storage": "6.2.2-preview" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 15df55085..0d2f1206f 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index c9edda9e3..f17e5b94f 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 73388fcea..6bcc02c9c 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 9a09debb8..41ac5ce8f 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json @@ -8,7 +8,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index 1bc628451..d4ecf731a 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json @@ -5,7 +5,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index 89dbcb1de..1d919006d 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index e2216c724..2cce5e3d2 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index a35500f2a..a2f57d69f 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -7,7 +7,7 @@ "net451": {}, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 29b70d265..cf97b2490 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 14a88876c..54928419c 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06", + "NETStandard.Library": "1.6.0-rc3-24210-10", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index c17db1208..cb41bb1fa 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json index a95f50056..e152b7a64 100644 --- a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json +++ b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json @@ -5,7 +5,7 @@ }, "packInclude": {}, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index 546750f5c..309d754d7 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json @@ -28,7 +28,7 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json index db154547e..c9e065bbe 100644 --- a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json +++ b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json @@ -4,7 +4,7 @@ "xmlDoc": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 229e25a3c..32a68dff8 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,12 +5,12 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" } }, "net451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24210-06" + "Microsoft.CSharp": "4.0.1-rc3-24210-10" } } }, diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index a58d9091c..0f66e0cdd 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,17 +5,17 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" } }, "netcore50": { "dependencies": { - "System.Private.Uri": "4.0.1-rc3-24210-06" + "System.Private.Uri": "4.0.1-rc3-24210-10" } }, "net99": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24210-06" + "Microsoft.CSharp": "4.0.1-rc3-24210-10" } } }, diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 8f8352324..815ce3ac0 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index 1485d5dcc..6bbf3ddfb 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004449-00", + "version": "1.0.0-rc3-004459-00", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 757511fed..edec9cff2 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index 361776a1c..f32d34cc9 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -3,7 +3,7 @@ "dependencies": { "L12": "1.0.0-*", "L21": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index 546b92d2a..356dfb0f9 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 1e24d5607..23cd1da8e 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 1e24d5607..23cd1da8e 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 89dbcb1de..1d919006d 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 89dbcb1de..1d919006d 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json index 25989e9c1..64571d94e 100644 --- a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json +++ b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json @@ -6,7 +6,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06", + "NETStandard.Library": "1.6.0-rc3-24210-10", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index bb0f8b4d5..6dbc3a1e4 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index b4b6e524e..b819fc948 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index 9ca43d5ea..a7bd68ca4 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00" + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" } }, "net451": { diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json index ed26ddd71..998eaf29b 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -10,9 +10,9 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06", - "System.Diagnostics.Process": "4.1.0-rc3-24210-06", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10", + "System.Diagnostics.Process": "4.1.0-rc3-24210-10", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index a0e599188..c544104b9 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004449-00"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004449-00"; + public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004459-00"; + public static readonly string SharedHostVersion = "1.0.1-rc3-004459-00"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 686e0f051..7f2265700 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -5,13 +5,13 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-01", - "Microsoft.CSharp": "4.0.1-rc3-24210-06", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-06", - "System.Reflection.Metadata": "1.3.0-rc3-24210-06", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", - "System.Xml.XmlSerializer": "4.0.11-rc3-24210-06", + "NETStandard.Library": "1.6.0-rc3-24210-10", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10", + "Microsoft.CSharp": "4.0.1-rc3-24210-10", + "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", + "System.Reflection.Metadata": "1.3.0-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Xml.XmlSerializer": "4.0.11-rc3-24210-10", "WindowsAzure.Storage": "6.2.2-preview", "NuGet.CommandLine.XPlat": "3.5.0-beta2-1451", "Microsoft.DotNet.Cli.Build.Framework": { diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 1986ba37b..0f1bd9cde 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "1.0.2-rc3-24210-01"; - public static readonly string JitVersion = "1.0.2-rc3-24210-01"; + public static readonly string CoreCLRVersion = "1.0.2-rc3-24210-10"; + public static readonly string JitVersion = "1.0.2-rc3-24210-10"; } } diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json index 726570ee3..47212f8e8 100644 --- a/build_projects/shared-build-targets-utils/project.json +++ b/build_projects/shared-build-targets-utils/project.json @@ -2,12 +2,12 @@ "version": "1.0.0-*", "description": "Build scripts for dotnet-cli", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06", - "Microsoft.CSharp": "4.0.1-rc3-24210-06", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-06", - "System.Reflection.Metadata": "1.3.0-rc3-24210-06", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", - "System.Xml.XmlSerializer": "4.0.11-rc3-24210-06", + "NETStandard.Library": "1.6.0-rc3-24210-10", + "Microsoft.CSharp": "4.0.1-rc3-24210-10", + "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", + "System.Reflection.Metadata": "1.3.0-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Xml.XmlSerializer": "4.0.11-rc3-24210-10", "WindowsAzure.Storage": "6.2.2-preview", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 323828f4c..4c5cfb768 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -5,10 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06", - "Microsoft.CSharp": "4.0.1-rc3-24210-06", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-01", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "NETStandard.Library": "1.6.0-rc3-24210-10", + "Microsoft.CSharp": "4.0.1-rc3-24210-10", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index ec97f914a..9e7156982 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -26,7 +26,7 @@ "portable-net45+wp80+win8+wpa81+dnxcore50" ], "dependencies": { - "System.Diagnostics.Process": "4.1.0-rc3-24210-06" + "System.Diagnostics.Process": "4.1.0-rc3-24210-10" } } } diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 857b9115c..6a465f630 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -4,7 +4,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160608-03", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160610-04", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 2757790c2..41065305c 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Linq.Expressions": "4.1.0-rc3-24210-06" + "System.Linq.Expressions": "4.1.0-rc3-24210-10" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index e229cd210..ed8a8a11a 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -10,14 +10,14 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.AppContext": "4.1.0-rc3-24210-06", - "System.Collections": "4.0.11-rc3-24210-06", - "System.IO": "4.1.0-rc3-24210-06", - "System.IO.FileSystem": "4.0.1-rc3-24210-06", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-06", - "System.Runtime.Extensions": "4.1.0-rc3-24210-06", - "System.Runtime.InteropServices": "4.1.0-rc3-24210-06", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24210-06" + "System.AppContext": "4.1.0-rc3-24210-10", + "System.Collections": "4.0.11-rc3-24210-10", + "System.IO": "4.1.0-rc3-24210-10", + "System.IO.FileSystem": "4.0.1-rc3-24210-10", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-10", + "System.Runtime.Extensions": "4.1.0-rc3-24210-10", + "System.Runtime.InteropServices": "4.1.0-rc3-24210-10", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24210-10" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 5512c57c8..88d1d7f7c 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -7,7 +7,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Runtime.Loader": "4.0.0-rc3-24210-06" + "System.Runtime.Loader": "4.0.0-rc3-24210-10" }, "frameworks": { "netstandard1.6": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index fda9fa0a1..ed0a7b253 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -10,7 +10,7 @@ "Microsoft.DotNet.Compiler.Common": { "target": "project" }, - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160608-03" + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160610-04" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 172393918..b647612ee 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -11,7 +11,7 @@ "Newtonsoft.Json": "9.0.1-beta1", "NuGet.Packaging": "3.5.0-beta2-1451", "NuGet.RuntimeModel": "3.5.0-beta2-1451", - "System.Reflection.Metadata": "1.3.0-rc3-24210-06" + "System.Reflection.Metadata": "1.3.0-rc3-24210-10" }, "frameworks": { "net451": { @@ -33,13 +33,13 @@ "dotnet5.4" ], "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24210-06", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-06", - "System.Runtime.Loader": "4.0.0-rc3-24210-06", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", - "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24210-06", - "System.Threading.Thread": "4.0.0-rc3-24210-06", - "System.Xml.XDocument": "4.0.11-rc3-24210-06" + "Microsoft.CSharp": "4.0.1-rc3-24210-10", + "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", + "System.Runtime.Loader": "4.0.0-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24210-10", + "System.Threading.Thread": "4.0.0-rc3-24210-10", + "System.Xml.XDocument": "4.0.11-rc3-24210-10" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 86f7145a4..228b15c74 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -16,9 +16,9 @@ "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { - "System.Diagnostics.Debug": "4.0.11-rc3-24210-06", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-06", - "System.Linq": "4.1.0-rc3-24210-06" + "System.Diagnostics.Debug": "4.0.11-rc3-24210-10", + "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", + "System.Linq": "4.1.0-rc3-24210-10" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 585ecc0a0..d461bb23f 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -22,8 +22,8 @@ "portable-net45+win8" ], "dependencies": { - "System.Resources.ResourceManager": "4.0.1-rc3-24210-06", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-06" + "System.Resources.ResourceManager": "4.0.1-rc3-24210-10", + "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-10" } } }, diff --git a/src/compilers/project.json b/src/compilers/project.json index 4bc7a14a5..dbce8408e 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,10 +6,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160608-03", - "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160608-03", + "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160610-04", + "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160610-04", "Microsoft.DiaSymReader.Native": "1.4.0-rc2" }, "frameworks": { diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index 03ca1c2ca..b1cbf583b 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index 9ed06c96b..85f2831fc 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template index 203692e21..1ad68b4a7 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, @@ -14,7 +14,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } }, "imports": [ diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index 9ee592f3b..91d768c92 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index f26ab9470..55f839613 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -28,8 +28,8 @@ }, "NuGet.CommandLine.XPlat": "3.5.0-beta2-1451", "Newtonsoft.Json": "9.0.1-beta1", - "System.Text.Encoding.CodePages": "4.0.1-rc3-24210-06", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24210-06", + "System.Text.Encoding.CodePages": "4.0.1-rc3-24210-10", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24210-10", "Microsoft.ApplicationInsights": "2.0.0", "Microsoft.DotNet.ProjectModel": { "target": "project" @@ -45,16 +45,16 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-06", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24210-06", - "System.Resources.Writer": "4.0.0-rc3-24210-06", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", - "System.Private.DataContractSerialization": "4.1.1-rc3-24210-06", - "System.Text.RegularExpressions": "4.1.0-rc3-24210-06", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-10", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24210-10", + "System.Resources.Writer": "4.0.0-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Private.DataContractSerialization": "4.1.1-rc3-24210-10", + "System.Text.RegularExpressions": "4.1.0-rc3-24210-10", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24210-06", + "version": "4.0.0-rc3-24210-10", "exclude": "compile" } }, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 21af0b55a..a391c9e5c 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 9e1060c77..88b1ba720 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index a1cc06298..8a911c5ab 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index aeb1b761f..b8875c599 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 13439de22..37db9c96a 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,10 +16,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-06", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "NuGet.Versioning": "3.5.0-beta2-1451", "NuGet.Packaging": "3.5.0-beta2-1451", "NuGet.Frameworks": "3.5.0-beta2-1451", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 78adce5ae..9bdddafa7 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json index cea676326..9458181ef 100644 --- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Microsoft.DotNet.ProjectModel.Loader": { "target": "project" diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 216230b2e..b7e04fb6c 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,9 +11,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index d3537b7bd..adfcf366d 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,9 +7,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-06", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-10", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Performance/project.json b/test/Performance/project.json index 6c36ed97c..3c79d334f 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index eabf2caa5..a184d35c6 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index 767090184..5ab96fa2e 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,12 +3,12 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index ce3ce2546..c12bbd674 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,13 +3,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", - "System.Diagnostics.Process": "4.1.0-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Diagnostics.Process": "4.1.0-rc3-24210-10", "TestAppWithPortablePdbs": { "target": "project" }, diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index 51664bea5..47e1d65d8 100644 --- a/test/TestingAbstractions/TestAppWithFullPdbs/project.json +++ b/test/TestingAbstractions/TestAppWithFullPdbs/project.json @@ -4,7 +4,7 @@ "debugType": "full" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": {} diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index 4837b472e..2a6dd8615 100644 --- a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json +++ b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0-rc3-24210-10" }, "frameworks": { "netstandard1.5": {} diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json index b5e5422c5..eb0b4c069 100644 --- a/test/binding-redirects.Tests/project.json +++ b/test/binding-redirects.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-06", + "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-10", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" } diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index c63d0e2ee..b5c21fcd0 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index e43fd1dee..a2387b9d8 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index 5b033e384..c9d3584e4 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 638fc76a3..f28ba9181 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 43315b68a..f5a673c55 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -23,7 +23,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24210-06", + "version": "4.0.0-rc3-24210-10", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index d639ce999..f80198f9f 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index b8ee21d14..508969c37 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", - "System.IO.Compression.ZipFile": "4.0.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.IO.Compression.ZipFile": "4.0.1-rc3-24210-10", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 93f1cdf7a..7812ce777 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,13 +2,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24210-06", + "version": "4.0.0-rc3-24210-10", "exclude": "Compile" }, "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -19,7 +19,7 @@ }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Net.NameResolution": "4.0.0-rc3-24210-06" + "System.Net.NameResolution": "4.0.0-rc3-24210-10" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 8a605e22d..c04255337 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.TestFramework": { "target": "project" }, @@ -15,7 +15,7 @@ "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00206", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24210-06" + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24210-10" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 3a3b9d9da..7799dc3a8 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index aeb1b761f..b8875c599 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index b3cd1ed31..1e3a48024 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 52a2a3926..23296092b 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Newtonsoft.Json": "9.0.1-beta1", "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -15,9 +15,9 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc3-24210-06", - "System.Net.Sockets": "4.1.0-rc3-24210-06", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Net.NameResolution": "4.0.0-rc3-24210-10", + "System.Net.Sockets": "4.1.0-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 3d7f8ccd3..b1723a0bd 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,14 +3,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, "Newtonsoft.Json": "9.0.1-beta1", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24210-06", + "version": "4.0.0-rc3-24210-10", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index a060f5ebd..9e21fa839 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0-rc3-004459-00" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-06", + "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index a3519ed06..da314f5b0 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004449-00", + "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From 99c32422b83d2004364308594f7e7df5f2fe27b4 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 10 Jun 2016 23:33:34 -0500 Subject: [PATCH 64/97] Update Microsoft.DiaSymReader to 1.0.8-rc2-60610-01 --- src/Microsoft.Extensions.Testing.Abstractions/project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index d461bb23f..7d4c3bba9 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.DiaSymReader": "1.0.8-rc2-60608-04", + "Microsoft.DiaSymReader": "1.0.8-rc2-60610-01", "Microsoft.DiaSymReader.Native": "1.4.0-rc2" }, "frameworks": { From 79bbfafc510cf17ab151df512b611ea72e2dffb5 Mon Sep 17 00:00:00 2001 From: Zlatko Knezevic Date: Sat, 11 Jun 2016 06:43:56 -0700 Subject: [PATCH 65/97] Fix the project.json for C# library and add tests (#3507) * Fix the project.json for C# library and add tests This commit fixes the bug introduced in project.json for the C# Library template. It also adds two simple tests for the library template that drop the class library and then restore and another that also builds. Fixes #3496 --- .../CSharp_Lib/project.json.template | 4 +- src/dotnet/commands/dotnet-new/README.md | 11 +++- .../GivenThatIWantANewCSLIbrary.cs | 58 +++++++++++++++++++ .../GivenThatIWantANewCSxUnitProject.cs | 58 +++++++++++++++++++ 4 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 test/dotnet-new.Tests/GivenThatIWantANewCSLIbrary.cs create mode 100644 test/dotnet-new.Tests/GivenThatIWantANewCSxUnitProject.cs diff --git a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template index 8b0aefe2a..a4b0be834 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template @@ -7,7 +7,9 @@ }, "frameworks": { "netstandard1.6": { - "NETStandard.Library": "1.5.0-rc3-24126-00" + "dependencies": { + "NETStandard.Library": "1.6.0-rc3-24210-06" + } } } } diff --git a/src/dotnet/commands/dotnet-new/README.md b/src/dotnet/commands/dotnet-new/README.md index 8968d1f9a..368ac7b39 100644 --- a/src/dotnet/commands/dotnet-new/README.md +++ b/src/dotnet/commands/dotnet-new/README.md @@ -29,7 +29,16 @@ Language of project. Defaults to `C##`. Also `csharp` ( `fsharp` ) or `cs` ( `fs `-t`, `--type` -Type of the project. Valid values are "console" and "web". +Type of the project. Valid values for C# are: + +* `console` +* `web` +* `lib` +* `xunittest` + +Valid values for F# are: + +* `console` ## EXAMPLES diff --git a/test/dotnet-new.Tests/GivenThatIWantANewCSLIbrary.cs b/test/dotnet-new.Tests/GivenThatIWantANewCSLIbrary.cs new file mode 100644 index 000000000..d580ea0ca --- /dev/null +++ b/test/dotnet-new.Tests/GivenThatIWantANewCSLIbrary.cs @@ -0,0 +1,58 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Microsoft.DotNet.Tools.Test.Utilities; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Xunit; +using FluentAssertions; + +namespace Microsoft.DotNet.Tests +{ + public class GivenThatIWantANewCSLibrary : TestBase + { + + [Fact] + public void When_library_created_Then_project_restores() + { + var rootPath = Temp.CreateDirectory().Path; + var projectJsonFile = Path.Combine(rootPath, "project.json"); + + new TestCommand("dotnet") { WorkingDirectory = rootPath } + .Execute("new --type lib") + .Should() + .Pass(); + + new TestCommand("dotnet") { WorkingDirectory = rootPath } + .Execute("restore") + .Should().Pass(); + + } + + [Fact] + public void When_dotnet_build_is_invoked_Then_project_builds_without_warnings() + { + var rootPath = Temp.CreateDirectory().Path; + + new TestCommand("dotnet") { WorkingDirectory = rootPath } + .Execute("new --type lib"); + + new TestCommand("dotnet") { WorkingDirectory = rootPath } + .Execute("restore"); + + var buildResult = new TestCommand("dotnet") + .WithWorkingDirectory(rootPath) + .ExecuteWithCapturedOutput("build") + .Should() + .Pass() + .And + .NotHaveStdErr(); + } + + + } +} diff --git a/test/dotnet-new.Tests/GivenThatIWantANewCSxUnitProject.cs b/test/dotnet-new.Tests/GivenThatIWantANewCSxUnitProject.cs new file mode 100644 index 000000000..777e03eea --- /dev/null +++ b/test/dotnet-new.Tests/GivenThatIWantANewCSxUnitProject.cs @@ -0,0 +1,58 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Microsoft.DotNet.Tools.Test.Utilities; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Xunit; +using FluentAssertions; + +namespace Microsoft.DotNet.Tests +{ + public class GivenThatIWantANewCSxUnitProject : TestBase + { + + [Fact] + public void When_xUnit_project_created_Then_project_restores() + { + var rootPath = Temp.CreateDirectory().Path; + var projectJsonFile = Path.Combine(rootPath, "project.json"); + + new TestCommand("dotnet") { WorkingDirectory = rootPath } + .Execute("new --type xunittest") + .Should() + .Pass(); + + new TestCommand("dotnet") { WorkingDirectory = rootPath } + .Execute("restore") + .Should().Pass(); + + } + + [Fact] + public void When_dotnet_test_is_invoked_Then_tests_run_without_errors() + { + var rootPath = Temp.CreateDirectory().Path; + + new TestCommand("dotnet") { WorkingDirectory = rootPath } + .Execute("new --type xunittest"); + + new TestCommand("dotnet") { WorkingDirectory = rootPath } + .Execute("restore"); + + var buildResult = new TestCommand("dotnet") + .WithWorkingDirectory(rootPath) + .ExecuteWithCapturedOutput("test") + .Should() + .Pass() + .And + .NotHaveStdErr(); + } + + + } +} From c1c7ca06c25369823c61dda115c8d59197f3cf14 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Sat, 11 Jun 2016 12:21:15 -0500 Subject: [PATCH 66/97] Update NuGet to 3.5.0-beta2-1480 --- build_projects/dotnet-cli-build/project.json | 2 +- build_projects/update-dependencies/project.json | 2 +- src/Microsoft.DotNet.Cli.Utils/project.json | 8 ++++---- src/Microsoft.DotNet.ProjectModel/project.json | 4 ++-- src/dotnet/project.json | 4 ++-- test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 7f2265700..479b8fa45 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -13,7 +13,7 @@ "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", "System.Xml.XmlSerializer": "4.0.11-rc3-24210-10", "WindowsAzure.Storage": "6.2.2-preview", - "NuGet.CommandLine.XPlat": "3.5.0-beta2-1451", + "NuGet.CommandLine.XPlat": "3.5.0-beta2-1480", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index 4c5cfb768..eab57b07e 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, - "NuGet.Versioning": "3.5.0-beta2-1451", + "NuGet.Versioning": "3.5.0-beta2-1480", "Newtonsoft.Json": "9.0.1-beta1", "Octokit": "0.18.0", "Microsoft.Net.Http": "2.2.29" diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 9e7156982..2bd0ad701 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -8,10 +8,10 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "NuGet.Versioning": "3.5.0-beta2-1451", - "NuGet.Packaging": "3.5.0-beta2-1451", - "NuGet.Frameworks": "3.5.0-beta2-1451", - "NuGet.ProjectModel": "3.5.0-beta2-1451" + "NuGet.Versioning": "3.5.0-beta2-1480", + "NuGet.Packaging": "3.5.0-beta2-1480", + "NuGet.Frameworks": "3.5.0-beta2-1480", + "NuGet.ProjectModel": "3.5.0-beta2-1480" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index b647612ee..bf867fffa 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -9,8 +9,8 @@ "target": "project" }, "Newtonsoft.Json": "9.0.1-beta1", - "NuGet.Packaging": "3.5.0-beta2-1451", - "NuGet.RuntimeModel": "3.5.0-beta2-1451", + "NuGet.Packaging": "3.5.0-beta2-1480", + "NuGet.RuntimeModel": "3.5.0-beta2-1480", "System.Reflection.Metadata": "1.3.0-rc3-24210-10" }, "frameworks": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 55f839613..78572fb98 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -23,10 +23,10 @@ }, "dependencies": { "NuGet.Commands": { - "version": "3.5.0-beta2-1451", + "version": "3.5.0-beta2-1480", "exclude": "compile" }, - "NuGet.CommandLine.XPlat": "3.5.0-beta2-1451", + "NuGet.CommandLine.XPlat": "3.5.0-beta2-1480", "Newtonsoft.Json": "9.0.1-beta1", "System.Text.Encoding.CodePages": "4.0.1-rc3-24210-10", "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24210-10", diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 37db9c96a..88c497746 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -20,10 +20,10 @@ }, "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-10", "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "NuGet.Versioning": "3.5.0-beta2-1451", - "NuGet.Packaging": "3.5.0-beta2-1451", - "NuGet.Frameworks": "3.5.0-beta2-1451", - "NuGet.ProjectModel": "3.5.0-beta2-1451", + "NuGet.Versioning": "3.5.0-beta2-1480", + "NuGet.Packaging": "3.5.0-beta2-1480", + "NuGet.Frameworks": "3.5.0-beta2-1480", + "NuGet.ProjectModel": "3.5.0-beta2-1480", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From 3c5e51adb24ab2d742009557223e418fdbb6bc7f Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Sat, 11 Jun 2016 12:36:00 -0500 Subject: [PATCH 67/97] System.Private.CoreLib.dll IL binary is getting crossgen'd mistakenly. This causes both the IL ".dll" and the native image "ni.dll" to be the same size in the Shared Framework. This is incorrect, as the IL binary is much smaller. The fix is to add ".dll" to the excludedLibraries list in the Crossgen util. Fix #3522 --- build_projects/shared-build-targets-utils/Utils/Crossgen.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_projects/shared-build-targets-utils/Utils/Crossgen.cs b/build_projects/shared-build-targets-utils/Utils/Crossgen.cs index 1d30acb37..b60207e7c 100644 --- a/build_projects/shared-build-targets-utils/Utils/Crossgen.cs +++ b/build_projects/shared-build-targets-utils/Utils/Crossgen.cs @@ -17,7 +17,7 @@ namespace Microsoft.DotNet.Cli.Build { "mscorlib.dll", "mscorlib.ni.dll", - "System.Private.CoreLib", + "System.Private.CoreLib.dll", "System.Private.CoreLib.ni.dll" }; From 42e890db79d48f5443b7c5515b726eb72ffb5786 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Mon, 13 Jun 2016 10:49:24 -0700 Subject: [PATCH 68/97] reenable deb --- build_projects/dotnet-cli-build/PublishTargets.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_projects/dotnet-cli-build/PublishTargets.cs b/build_projects/dotnet-cli-build/PublishTargets.cs index bd51c3469..984ae2840 100644 --- a/build_projects/dotnet-cli-build/PublishTargets.cs +++ b/build_projects/dotnet-cli-build/PublishTargets.cs @@ -179,7 +179,7 @@ namespace Microsoft.DotNet.Cli.Build [Target( nameof(PublishTargets.PublishInstallerFilesToAzure), nameof(PublishTargets.PublishArchivesToAzure), - /*nameof(PublishTargets.PublishDebFilesToDebianRepo),*/ //https://github.com/dotnet/cli/issues/2973 + nameof(PublishTargets.PublishDebFilesToDebianRepo), nameof(PublishTargets.PublishCliVersionBadge))] public static BuildTargetResult PublishArtifacts(BuildTargetContext c) => c.Success(); From 579018272756925d885007657a9284af3634ba1c Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Mon, 13 Jun 2016 14:06:05 -0700 Subject: [PATCH 69/97] Remove File.Copy optimization during expansion Previously we'd keep track of any file that we extracted once and try to reuse that file (by copying it) if we needed the same file later at a different destination. The reason was that it's theoretically faster to a file copy than a createfile and write, since the copy can happen entirely in the kernel. In practice we were foiled by AV scanners. This happens to be the only time during extraction where we let a file close after writing it and then try and use it again. Sure enough on fast machines we were seeing that as soon as we closed it MsMpEng would map the file for exclusive access causing our copy to fail with a sharing violation. To fix this, I've removed the copy optimization and will just copy the file from the in-memory archive every time. --- src/Microsoft.DotNet.Archive/IndexedArchive.cs | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Microsoft.DotNet.Archive/IndexedArchive.cs b/src/Microsoft.DotNet.Archive/IndexedArchive.cs index 6e5e81030..a2847f7fc 100644 --- a/src/Microsoft.DotNet.Archive/IndexedArchive.cs +++ b/src/Microsoft.DotNet.Archive/IndexedArchive.cs @@ -238,7 +238,7 @@ namespace Microsoft.DotNet.Archive private class ExtractSource { private string _entryName; - private string _localPath; + private readonly string _localPath; private ThreadLocalZipArchive _archive; public ExtractSource(string sourceString, Dictionary externalFiles, ThreadLocalZipArchive archive) @@ -271,20 +271,9 @@ namespace Microsoft.DotNet.Archive } else { - // we open the archive each time since ZipArchive is not thread safe and we want to be able - // to extract from many threads - //using (var archive = new ZipArchive(File.Open(_archivePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete))) using (var sourceStream = _archive.Archive.GetEntry(_entryName).Open()) { sourceStream.CopyTo(destinationStream); - - var destinationFileStream = destinationStream as FileStream; - if (destinationFileStream != null) - { - // Set Local path so that the next copy operation using the same source will - // do a copy instead of a write. - _localPath = destinationFileStream.Name; - } } } From dfe99ca45d9165a275d316b2b6ef5a24e6f840ba Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 14 Jun 2016 03:03:55 -0500 Subject: [PATCH 70/97] Port https://github.com/dotnet/core-setup/pull/159 to CLI --- build_projects/dotnet-cli-build/build.ps1 | 21 +++++++++++++++++++++ build_projects/dotnet-cli-build/build.sh | 8 ++++++++ 2 files changed, 29 insertions(+) diff --git a/build_projects/dotnet-cli-build/build.ps1 b/build_projects/dotnet-cli-build/build.ps1 index 73f5f5e9d..8094ed22c 100644 --- a/build_projects/dotnet-cli-build/build.ps1 +++ b/build_projects/dotnet-cli-build/build.ps1 @@ -10,6 +10,21 @@ param( [switch]$NoPackage, [switch]$Help) +function RemoveDirectory([string] $path) +{ + if (Test-Path $path) + { + Remove-Item $path -Recurse -Force + } +} + +function CleanNuGet() +{ + RemoveDirectory($env:LocalAppData + "\NuGet\Cache") + RemoveDirectory($env:LocalAppData + "\NuGet\v3-cache") + RemoveDirectory($env:NUGET_PACKAGES) +} + if($Help) { Write-Host "Usage: .\build.ps1 [-Configuration ] [-NoPackage] [-Help] [-Targets ]" @@ -63,6 +78,12 @@ if($LASTEXITCODE -ne 0) { throw "Failed to install stage0" } # Put the stage0 on the path $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH" +# Ensure clean package folder and caches +CleanNuGet + +# Disable first run since we want to control all package sources +$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + # Restore the build scripts Write-Host "Restoring Build Script projects..." pushd "$PSScriptRoot\.." diff --git a/build_projects/dotnet-cli-build/build.sh b/build_projects/dotnet-cli-build/build.sh index 2ec1a8a24..77fd912ca 100755 --- a/build_projects/dotnet-cli-build/build.sh +++ b/build_projects/dotnet-cli-build/build.sh @@ -101,6 +101,14 @@ then ulimit -n 1024 fi +# Clean old NuGet packages +rm -rf "$HOME/.local/share/NuGet/Cache" +rm -rf "$HOME/.local/share/NuGet/v3-cache" +rm -rf "$NUGET_PACKAGES" + +# Disable first run since we want to control all package sources +export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + # Restore the build scripts echo "Restoring Build Script projects..." ( From f25f047376a120a519ca7675d71abc0234ae337c Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 14 Jun 2016 03:14:53 -0500 Subject: [PATCH 71/97] Updating CoreFX, CoreCLR, Roslyn, CoreSetup to stable versions. --- .../project.json | 2 +- .../DesktopAppWithNativeDep/project.json | 2 +- .../KestrelDesktop/project.json | 2 +- .../KestrelDesktopForce32/project.json | 2 +- .../KestrelDesktopWithRuntimes/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../src/BrokenProjectPathSample/project.json | 2 +- .../src/EmptyConsoleApp/project.json | 2 +- .../src/EmptyLibrary/project.json | 2 +- .../src/EmptyNetCoreApp/project.json | 2 +- .../src/FailReleaseProject/project.json | 2 +- .../IncompatiblePackageSample/project.json | 2 +- .../src/Project1/project.json | 2 +- .../ToolWithOutputName/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../dotnet-desktop-and-portable/project.json | 2 +- .../dotnet-hello/v1/dotnet-hello/project.json | 2 +- .../dotnet-hello/v2/dotnet-hello/project.json | 2 +- .../TestPackages/dotnet-portable/project.json | 2 +- .../TestApp1/project.json | 2 +- .../TestApp2/project.json | 2 +- .../AppWithBomGlobalJson/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithDirectDependency/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../AppWithNet46AndRoslyn/project.json | 2 +- .../AppWithOutputAssemblyName/project.json | 2 +- .../AppWithToolDependency/project.json | 2 +- .../TestProjects/CompileFail/project.json | 2 +- .../PortableApp_Standalone/project.json | 2 +- .../DependencyContextFromTool/project.json | 2 +- .../DependencyContextValidator/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestAppDeps/project.json | 2 +- .../TestAppFullClr/project.json | 2 +- .../TestAppPortable/project.json | 2 +- .../TestAppPortableDeps/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestProjects/EndToEndTestApp/project.json | 2 +- .../CompileFailApp/project.json | 2 +- .../FSharpTestProjects/TestApp/project.json | 2 +- .../TestAppWithArgs/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../KestrelPortable/project.json | 2 +- .../KestrelStandalone/project.json | 2 +- .../project.json | 2 +- .../OutputStandardOutputAndError/project.json | 2 +- .../SingleTargetApp/project.json | 2 +- .../SingleTargetP0/project.json | 2 +- .../SingleTargetP1/project.json | 2 +- .../SingleTargetP2/project.json | 2 +- .../TwoTargetApp/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP0/project.json | 6 +++--- .../TwoTargetGraph/TwoTargetP1/project.json | 4 ++-- .../TwoTargetGraph/TwoTargetP2/project.json | 4 ++-- .../TwoTargetLargeP0/project.json | 6 +++--- .../TwoTargetLargeP1/project.json | 4 ++-- .../TwoTargetLargeP2/project.json | 4 ++-- .../TwoTargetLargeP3/project.json | 4 ++-- .../TwoTargetLargeP4/project.json | 4 ++-- .../TwoTargetLargeP5/project.json | 4 ++-- .../TwoTargetLargeP6/project.json | 4 ++-- .../PortableTests/PortableApp/project.json | 2 +- .../project.json | 4 ++-- .../PortableAppWithNative/project.json | 2 +- .../PortableTests/StandaloneApp/project.json | 2 +- .../MultipleFrameworkProject/project.json | 8 ++++---- .../NetCoreAppOnlyProject/project.json | 6 +++--- .../ResourcesTests/TestApp/project.json | 2 +- .../TestLibraryWithResources/project.json | 2 +- .../TestAppMultiTarget/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestProjects/TestAppSimple/project.json | 2 +- .../TestProjects/TestAppWithArgs/project.json | 2 +- .../App/project.json | 2 +- .../LibraryWithBuildDependency/project.json | 2 +- .../TestAppWithContentPackage/project.json | 2 +- .../TestAppWithContents/project.json | 2 +- .../TestAppWithLibrary/TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestAppWithResourceDeps/project.json | 12 +++++------ .../TestAppWithScripts/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../TestAppWithUnicodéPath/project.json | 2 +- .../TestApp/project.json | 2 +- .../TestLibraryGreater/project.json | 2 +- .../TestLibraryLesser/project.json | 2 +- .../TestLibraryWithAnalyzer/project.json | 2 +- .../TestLibraryWithConfiguration/project.json | 2 +- .../project.json | 2 +- .../project.json | 2 +- .../TestLibraryWithXmlDoc/project.json | 2 +- .../TestMicrosoftCSharpReference/project.json | 4 ++-- .../project.json | 6 +++--- .../TestMscorlibReference/project.json | 2 +- .../project.json | 2 +- .../src/L0/project.json | 2 +- .../src/L11/project.json | 2 +- .../src/L12/project.json | 2 +- .../src/L21/project.json | 2 +- .../src/L22/project.json | 2 +- .../project.json | 2 +- .../TestProjectWithResource/project.json | 2 +- .../TestLibraryWithRuleSet/project.json | 2 +- .../TestSimpleIncrementalApp/project.json | 2 +- .../TestSystemCoreReference/project.json | 2 +- .../TestSystemReference/project.json | 2 +- .../project.json | 6 +++--- .../dotnet-cli-build/CliDependencyVersions.cs | 4 ++-- build_projects/dotnet-cli-build/project.json | 14 ++++++------- .../DependencyVersions.cs | 4 ++-- .../shared-build-targets-utils/project.json | 12 +++++------ .../update-dependencies/project.json | 8 ++++---- src/Microsoft.DotNet.Archive/project.json | 4 ++-- src/Microsoft.DotNet.Cli.Utils/project.json | 2 +- .../project.json | 2 +- src/Microsoft.DotNet.Files/project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 2 +- .../project.json | 2 +- .../project.json | 16 +++++++-------- .../project.json | 6 +++--- .../project.json | 4 ++-- src/compilers/project.json | 6 +++--- src/dotnet-archive/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- .../CSharp_Console/project.json.template | 2 +- .../CSharp_Lib/project.json.template | 5 ++--- .../CSharp_xunittest/project.json.template | 4 ++-- .../FSharp_Console/project.json.template | 2 +- src/dotnet/project.json | 20 +++++++++---------- test/ArgumentForwardingTests/project.json | 4 ++-- test/ArgumentsReflector/project.json | 2 +- test/EndToEnd/project.json | 4 ++-- test/Kestrel.Tests/project.json | 4 ++-- .../project.json | 6 +++--- .../project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 2 +- .../project.json | 4 ++-- .../project.json | 4 ++-- test/Performance/project.json | 4 ++-- test/ScriptExecutorTests/project.json | 2 +- .../project.json | 4 ++-- .../project.json | 6 +++--- .../TestAppWithFullPdbs/project.json | 2 +- .../TestAppWithPortablePdbs/project.json | 2 +- test/binding-redirects.Tests/project.json | 2 +- test/crossgen.Tests/project.json | 2 +- test/dotnet-build.Tests/project.json | 4 ++-- test/dotnet-compile-fsc.Tests/project.json | 2 +- test/dotnet-compile.Tests/project.json | 4 ++-- test/dotnet-compile.UnitTests/project.json | 4 ++-- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 6 +++--- .../project.json | 6 +++--- test/dotnet-publish.Tests/project.json | 6 +++--- test/dotnet-resgen.Tests/project.json | 4 ++-- test/dotnet-run.Tests/project.json | 4 ++-- test/dotnet-run.UnitTests/project.json | 4 ++-- test/dotnet-test.Tests/project.json | 8 ++++---- test/dotnet-test.UnitTests/project.json | 4 ++-- test/dotnet.Tests/project.json | 4 ++-- tools/Archiver/project.json | 2 +- tools/MultiProjectValidator/project.json | 2 +- 173 files changed, 280 insertions(+), 281 deletions(-) diff --git a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json index 49096589b..885607884 100644 --- a/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "imports": [ diff --git a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json index 498535ab2..30113b6e3 100644 --- a/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json +++ b/TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "PackageWithFakeNativeDep": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-10" + "Microsoft.NETCore.Platforms": "1.0.1" }, "buildOptions": { "emitEntryPoint": true diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json index f4c3018e7..5bd1f2723 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-10" + "Microsoft.NETCore.Platforms": "1.0.1" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json index b8193f98d..93adffa3d 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-10" + "Microsoft.NETCore.Platforms": "1.0.1" }, "buildOptions": { "platform": "anycpu32bitpreferred", diff --git a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json index e6fe889b6..700f1e2f7 100644 --- a/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json +++ b/TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json @@ -4,7 +4,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113", "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113", "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-10" + "Microsoft.NETCore.Platforms": "1.0.1" }, "buildOptions": { "emitEntryPoint": true, diff --git a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json index ac8e9ead8..1d8d8a92c 100644 --- a/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json +++ b/TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json @@ -9,7 +9,7 @@ "frameworks": { "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "imports": [ "portable-net45+win8", diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json index 151db940e..26475560f 100644 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": { "target": "project" diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json index 5c39bd3bb..6390ad290 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", + "Microsoft.NETCore.App": "1.0.0", "EmptyLibrary": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json index c2933f29c..a1827ad70 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" } }, "dnx451": {} diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json index 0b5806c34..3ab07f47c 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json @@ -5,7 +5,7 @@ "netstandard1.3": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json index 32e0728ff..b20601e54 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Newtonsoft.Json": "8.0.3" } diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json index f3c2a4d7d..6bddf49a1 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json @@ -3,7 +3,7 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" } } }, diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json index e5e563d22..6a03cc355 100644 --- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", + "Microsoft.NETCore.App": "1.0.0", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json index 880385704..71152b304 100755 --- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json +++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/ToolWithOutputName/project.json b/TestAssets/TestPackages/ToolWithOutputName/project.json index 30ea24932..c728ac1ea 100644 --- a/TestAssets/TestPackages/ToolWithOutputName/project.json +++ b/TestAssets/TestPackages/ToolWithOutputName/project.json @@ -9,7 +9,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json index 2bd588d5b..b42583346 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.Extensions.DependencyModel": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json index 0163ecc6e..02f977709 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json index e76c58e56..6889f3f1d 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } }, diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index 20f067b60..17cca0fd2 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index d5df4239a..79ad59bc8 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json index c176da7a8..587918c49 100644 --- a/TestAssets/TestPackages/dotnet-portable/project.json +++ b/TestAssets/TestPackages/dotnet-portable/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json index 1932a9e97..f4346ead4 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json index e0e08326b..23295a370 100644 --- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json +++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json index 90e613311..c8fec215d 100644 --- a/TestAssets/TestProjects/AppWithBomGlobalJson/project.json +++ b/TestAssets/TestProjects/AppWithBomGlobalJson/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json index 3eedd3dcd..bb444a6c7 100644 --- a/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004459-00", + "version": "1.0.0", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json index 101b6de99..cffe971fe 100644 --- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", + "Microsoft.NETCore.App": "1.0.0", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json index a10d15456..d9d9fa091 100644 --- a/TestAssets/TestProjects/AppWithDirectDependency/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", + "Microsoft.NETCore.App": "1.0.0", "dotnet-hello": { "version": "1.0.0", "target": "package" diff --git a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json index aa7f65e32..3f2f8a04c 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004459-00", + "version": "1.0.0", "type": "platform" }, "xunit.core": "2.1.0", diff --git a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json index fa98be05a..535efe2d1 100644 --- a/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json +++ b/TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json @@ -8,7 +8,7 @@ "target": "package" }, "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004459-00", + "version": "1.0.0", "type": "platform" } }, diff --git a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json index 66f5463c1..c302fc457 100644 --- a/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json +++ b/TestAssets/TestProjects/AppWithNet46AndRoslyn/project.json @@ -3,7 +3,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160610-04" + "Microsoft.CodeAnalysis.CSharp": "1.3.0" }, "frameworks": { "net46": {} diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json index 86bdd1df0..98ce82ca2 100644 --- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json index 5548d4571..5f5ebe36d 100644 --- a/TestAssets/TestProjects/AppWithToolDependency/project.json +++ b/TestAssets/TestProjects/AppWithToolDependency/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index 1d919006d..7992d095a 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json index e0e08326b..23295a370 100644 --- a/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json +++ b/TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/DependencyContextFromTool/project.json b/TestAssets/TestProjects/DependencyContextFromTool/project.json index 1cd3f3add..828af60de 100644 --- a/TestAssets/TestProjects/DependencyContextFromTool/project.json +++ b/TestAssets/TestProjects/DependencyContextFromTool/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json index 7ba4470b2..ece3b95e7 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json @@ -9,7 +9,7 @@ "netstandard1.6": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } }, "net451": {} diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json index 84e979c84..5b51b8184 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json @@ -5,7 +5,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", + "Microsoft.NETCore.App": "1.0.0", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json index 22cc1852a..a1a559368 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", + "Microsoft.NETCore.App": "1.0.0", "DependencyContextValidator": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json index a95eec9b1..002b9d168 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json @@ -7,7 +7,7 @@ "dependencies": { "DependencyContextValidator": "1.0.0-*", "System.Diagnostics.Process": { - "version": "4.1.0-rc3-24210-10", + "version": "4.1.0", "type": "build" } }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json index 4b2b86fd0..8183a28d3 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json index 49ebd4a9c..045b78200 100644 --- a/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json +++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "DependencyContextValidator": "1.0.0-*" }, diff --git a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json index cf0fde8fd..25e317a8b 100644 --- a/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json +++ b/TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json @@ -2,7 +2,7 @@ "version": "1.0.0", "dependencies": { "TestLibrary": "1.0.0", - "System.IO.Compression": "4.1.0-rc3-24210-10" + "System.IO.Compression": "4.1.0" }, "frameworks": { "net461": {} diff --git a/TestAssets/TestProjects/EndToEndTestApp/project.json b/TestAssets/TestProjects/EndToEndTestApp/project.json index 762034df4..a83d47689 100644 --- a/TestAssets/TestProjects/EndToEndTestApp/project.json +++ b/TestAssets/TestProjects/EndToEndTestApp/project.json @@ -14,7 +14,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "packOptions": { "files": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index f69d91bcf..6bbb1f258 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index e0cfd5df5..c624d6511 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -14,7 +14,7 @@ "version": "1.0.0-*", "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", + "Microsoft.NETCore.App": "1.0.0", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 33ffd4602..466d60006 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index 5865cdf2e..89ad68468 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json index 1da519820..01dfc053a 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json @@ -18,7 +18,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "imports": [ diff --git a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json index c2a38ff73..2c8661b5c 100644 --- a/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json +++ b/TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json @@ -16,7 +16,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "imports": [ "dnxcore50", diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json index 87000fe5f..c2d11ff89 100644 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json @@ -3,7 +3,7 @@ "outputName": "MyLibrary" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json index 1d919006d..7992d095a 100644 --- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json +++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json index ad3934e3c..31b344316 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json index fe7da3595..ca8453bdc 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json @@ -9,7 +9,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json index 09a81077f..5bffe254f 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json @@ -6,7 +6,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json index 293f417ad..0a146084d 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json index dde335cd4..658a0b73b 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json @@ -9,14 +9,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10" + "NETStandard.Library": "1.6.0", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json index 796341b86..525f7d864 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10" + "NETStandard.Library": "1.6.0", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json index b6dd4956a..669221ffa 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json index b2c7dfbd3..39b763734 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json index 56c1af3c7..0d89fc2cf 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json @@ -13,14 +13,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } }, "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10" + "NETStandard.Library": "1.6.0", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" } } }, diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json index d90035e80..21713ec18 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json index db09f7fa5..e9f6aeee1 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json index 8ac7aa597..4a2e36e33 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json @@ -10,13 +10,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json index 90235fad0..cb5a7f09c 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json @@ -13,13 +13,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json index b2c7dfbd3..39b763734 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json index b2c7dfbd3..39b763734 100644 --- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json +++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json @@ -6,13 +6,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } }, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json index f40d0c096..6fe0ce23c 100644 --- a/TestAssets/TestProjects/PortableTests/PortableApp/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json @@ -8,7 +8,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json index a25cf4b09..5d37fd7dc 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json @@ -4,14 +4,14 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160610-04" + "Microsoft.CodeAnalysis.CSharp": "1.3.0" }, "frameworks": { "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } } } diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json index 095c58de8..a66cc090e 100644 --- a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json +++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json @@ -7,7 +7,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Libuv": "1.9.0-rc2-20896" diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json index 2f1b31240..423e4ed9b 100644 --- a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json +++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json @@ -5,7 +5,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" } } }, diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json index aaec13eb5..734eaa9a3 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-10", + "Microsoft.NETCore.Platforms": "1.0.1", "xunit": "2.1.0" }, "frameworks": { @@ -15,10 +15,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Linq.Expressions": "4.1.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10" + "System.Linq.Expressions": "4.1.0", + "System.Runtime.Serialization.Primitives": "4.1.1" } }, "net451": {} diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json index 5fcee9437..841f5b74d 100644 --- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json +++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Linq.Expressions": "4.1.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Linq.Expressions": "4.1.0", + "System.Runtime.Serialization.Primitives": "4.1.1", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json index 1e03be991..9108a8d6d 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestApp/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestApp/project.json @@ -7,7 +7,7 @@ "Microsoft.Data.OData": "5.6.4", "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "TestLibraryWithResources": { "target": "project" diff --git a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json index 23cd1da8e..023156a9b 100644 --- a/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json +++ b/TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json index 5e796a431..642a05576 100644 --- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json +++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json @@ -7,7 +7,7 @@ "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004459-00", + "version": "1.0.0", "type": "platform" } } diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json index c111e7f5d..c9e62cb6c 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "TestLibrary": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json index 29a9c0bde..48bc772d8 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppSimple/project.json b/TestAssets/TestProjects/TestAppSimple/project.json index 1d919006d..7992d095a 100644 --- a/TestAssets/TestProjects/TestAppSimple/project.json +++ b/TestAssets/TestProjects/TestAppSimple/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index 1d919006d..7992d095a 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json index 46e224cce..ea017ca5a 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "LibraryWithBuildDependency": { "target": "project" diff --git a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json index 4014d737e..974daa091 100644 --- a/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.Net.Compilers": { "type": "build", diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json index aa6098f61..aa869ee87 100644 --- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json +++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json @@ -5,7 +5,7 @@ "outputName": "AppWithContentPackage" }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", + "Microsoft.NETCore.App": "1.0.0", "SharedContentA": "1.0.0-*" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index 83d5bf240..e68525165 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -7,7 +7,7 @@ } }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json index 2cce5e3d2..da12c491f 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index 29a9c0bde..48bc772d8 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json index 596cd8ec1..4cfc1d190 100644 --- a/TestAssets/TestProjects/TestAppWithResourceDeps/project.json +++ b/TestAssets/TestProjects/TestAppWithResourceDeps/project.json @@ -4,12 +4,12 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", - "Microsoft.CSharp": "4.0.1-rc3-24210-10", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", - "System.Reflection.Metadata": "1.3.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.Xml.XmlSerializer": "4.0.11-rc3-24210-10", + "Microsoft.NETCore.App": "1.0.0", + "Microsoft.CSharp": "4.0.1", + "System.Dynamic.Runtime": "4.0.11", + "System.Reflection.Metadata": "1.3.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Xml.XmlSerializer": "4.0.11", "WindowsAzure.Storage": "6.2.2-preview" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json index 0d2f1206f..aaaf3f4f1 100644 --- a/TestAssets/TestProjects/TestAppWithScripts/project.json +++ b/TestAssets/TestProjects/TestAppWithScripts/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json index f17e5b94f..24fe24f65 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 6bcc02c9c..2a6005a2c 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 41ac5ce8f..4854b7706 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json @@ -8,7 +8,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index d4ecf731a..4a3ab1eaf 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json @@ -5,7 +5,7 @@ "target": "project", "version": "1.0.0-*" }, - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json index 1d919006d..7992d095a 100644 --- a/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json +++ b/TestAssets/TestProjects/TestAppWithUnicodéPath/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json index 2cce5e3d2..da12c491f 100644 --- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json +++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json @@ -9,7 +9,7 @@ "target": "project", "version": "1.0.0-*" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index a2f57d69f..b24e0eca8 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -7,7 +7,7 @@ "net451": {}, "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index cf97b2490..c425f741c 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -13,7 +13,7 @@ "net451": {}, "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "imports": "portable-net45+win8" } diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 54928419c..73a907775 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", + "NETStandard.Library": "1.6.0", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json index cb41bb1fa..d979400d2 100644 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json @@ -10,7 +10,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "configurations": { "Test": {} diff --git a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json index e152b7a64..90cf856ff 100644 --- a/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json +++ b/TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json @@ -5,7 +5,7 @@ }, "packInclude": {}, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json index 309d754d7..396636d98 100644 --- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json +++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json @@ -28,7 +28,7 @@ "netstandard1.5": { "imports": "dnxcore50", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" } } } diff --git a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json index c9e065bbe..eea518a92 100644 --- a/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json +++ b/TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json @@ -4,7 +4,7 @@ "xmlDoc": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json index 32a68dff8..77ebea69b 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json @@ -5,12 +5,12 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" } }, "net451": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24210-10" + "Microsoft.CSharp": "4.0.1" } } }, diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json index 0f66e0cdd..ecff54208 100644 --- a/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json +++ b/TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json @@ -5,17 +5,17 @@ "netcoreapp1.0": { "imports": "dnxcore50", "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" } }, "netcore50": { "dependencies": { - "System.Private.Uri": "4.0.1-rc3-24210-10" + "System.Private.Uri": "4.0.1" } }, "net99": { "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24210-10" + "Microsoft.CSharp": "4.0.1" } } }, diff --git a/TestAssets/TestProjects/TestMscorlibReference/project.json b/TestAssets/TestProjects/TestMscorlibReference/project.json index 815ce3ac0..8c2cbdd57 100644 --- a/TestAssets/TestProjects/TestMscorlibReference/project.json +++ b/TestAssets/TestProjects/TestMscorlibReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" } }, "net451": { diff --git a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json index 6bbf3ddfb..a71b16492 100644 --- a/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json +++ b/TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "Microsoft.NETCore.App": { - "version": "1.0.0-rc3-004459-00", + "version": "1.0.0", "type": "platform" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index edec9cff2..02b8a86b3 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -6,7 +6,7 @@ "dependencies": { "L11": "1.0.0-*", "L12": "1.0.0-*", - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index f32d34cc9..0c4571970 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -3,7 +3,7 @@ "dependencies": { "L12": "1.0.0-*", "L21": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index 356dfb0f9..bb8f44070 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index 23cd1da8e..023156a9b 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index 23cd1da8e..023156a9b 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index 1d919006d..7992d095a 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index 1d919006d..7992d095a 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json index 64571d94e..8a95d52f2 100644 --- a/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json +++ b/TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json @@ -6,7 +6,7 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", + "NETStandard.Library": "1.6.0", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 6dbc3a1e4..bd272bd57 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -5,7 +5,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/TestAssets/TestProjects/TestSystemCoreReference/project.json b/TestAssets/TestProjects/TestSystemCoreReference/project.json index b819fc948..14cdbb53e 100644 --- a/TestAssets/TestProjects/TestSystemCoreReference/project.json +++ b/TestAssets/TestProjects/TestSystemCoreReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" } }, "net451": { diff --git a/TestAssets/TestProjects/TestSystemReference/project.json b/TestAssets/TestProjects/TestSystemReference/project.json index a7bd68ca4..7d9a8b91b 100644 --- a/TestAssets/TestProjects/TestSystemReference/project.json +++ b/TestAssets/TestProjects/TestSystemReference/project.json @@ -4,7 +4,7 @@ "frameworks": { "netcoreapp1.0": { "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00" + "Microsoft.NETCore.App": "1.0.0" } }, "net451": { diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json index 998eaf29b..c8fdcde8a 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json @@ -10,9 +10,9 @@ ] }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", - "System.Diagnostics.Process": "4.1.0-rc3-24210-10", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-10" + "NETStandard.Library": "1.6.0", + "System.Diagnostics.Process": "4.1.0", + "System.Reflection.TypeExtensions": "4.1.0" }, "frameworks": { "netstandard1.5": { diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index c544104b9..9a0adf214 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build { public class CliDependencyVersions { - public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004459-00"; - public static readonly string SharedHostVersion = "1.0.1-rc3-004459-00"; + public static readonly string SharedFrameworkVersion = "1.0.0"; + public static readonly string SharedHostVersion = "1.0.1"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 479b8fa45..18f710a24 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -5,13 +5,13 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10", - "Microsoft.CSharp": "4.0.1-rc3-24210-10", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", - "System.Reflection.Metadata": "1.3.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.Xml.XmlSerializer": "4.0.11-rc3-24210-10", + "NETStandard.Library": "1.6.0", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2", + "Microsoft.CSharp": "4.0.1", + "System.Dynamic.Runtime": "4.0.11", + "System.Reflection.Metadata": "1.3.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Xml.XmlSerializer": "4.0.11", "WindowsAzure.Storage": "6.2.2-preview", "NuGet.CommandLine.XPlat": "3.5.0-beta2-1480", "Microsoft.DotNet.Cli.Build.Framework": { diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 0f1bd9cde..2a43aa7f8 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "1.0.2-rc3-24210-10"; - public static readonly string JitVersion = "1.0.2-rc3-24210-10"; + public static readonly string CoreCLRVersion = "1.0.2"; + public static readonly string JitVersion = "1.0.2"; } } diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json index 47212f8e8..7ccbe17cb 100644 --- a/build_projects/shared-build-targets-utils/project.json +++ b/build_projects/shared-build-targets-utils/project.json @@ -2,12 +2,12 @@ "version": "1.0.0-*", "description": "Build scripts for dotnet-cli", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", - "Microsoft.CSharp": "4.0.1-rc3-24210-10", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", - "System.Reflection.Metadata": "1.3.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.Xml.XmlSerializer": "4.0.11-rc3-24210-10", + "NETStandard.Library": "1.6.0", + "Microsoft.CSharp": "4.0.1", + "System.Dynamic.Runtime": "4.0.11", + "System.Reflection.Metadata": "1.3.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Xml.XmlSerializer": "4.0.11", "WindowsAzure.Storage": "6.2.2-preview", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index eab57b07e..c386a54f3 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -5,10 +5,10 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10", - "Microsoft.CSharp": "4.0.1-rc3-24210-10", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "NETStandard.Library": "1.6.0", + "Microsoft.CSharp": "4.0.1", + "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/src/Microsoft.DotNet.Archive/project.json b/src/Microsoft.DotNet.Archive/project.json index 564b171cf..b5a9fe4d6 100644 --- a/src/Microsoft.DotNet.Archive/project.json +++ b/src/Microsoft.DotNet.Archive/project.json @@ -5,8 +5,8 @@ }, "description": "Archive and compression types.", "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24201-00", - "System.Linq.Parallel": "4.0.1-rc3-24201-00" + "NETStandard.Library": "1.6.0", + "System.Linq.Parallel": "4.0.1" }, "frameworks": { "netstandard1.3": {} diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 2bd0ad701..0502f7d75 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -26,7 +26,7 @@ "portable-net45+wp80+win8+wpa81+dnxcore50" ], "dependencies": { - "System.Diagnostics.Process": "4.1.0-rc3-24210-10" + "System.Diagnostics.Process": "4.1.0" } } } diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 6a465f630..f417afaee 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -4,7 +4,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160610-04", + "Microsoft.CodeAnalysis.CSharp": "1.3.0", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index 41065305c..d0fd8d083 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Linq.Expressions": "4.1.0-rc3-24210-10" + "System.Linq.Expressions": "4.1.0" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index ed8a8a11a..df3817ea1 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -10,14 +10,14 @@ "net451": {}, "netstandard1.3": { "dependencies": { - "System.AppContext": "4.1.0-rc3-24210-10", - "System.Collections": "4.0.11-rc3-24210-10", - "System.IO": "4.1.0-rc3-24210-10", - "System.IO.FileSystem": "4.0.1-rc3-24210-10", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-10", - "System.Runtime.Extensions": "4.1.0-rc3-24210-10", - "System.Runtime.InteropServices": "4.1.0-rc3-24210-10", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24210-10" + "System.AppContext": "4.1.0", + "System.Collections": "4.0.11", + "System.IO": "4.1.0", + "System.IO.FileSystem": "4.0.1", + "System.Reflection.TypeExtensions": "4.1.0", + "System.Runtime.Extensions": "4.1.0", + "System.Runtime.InteropServices": "4.1.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" } } }, diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 88d1d7f7c..bec315e14 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -7,7 +7,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Runtime.Loader": "4.0.0-rc3-24210-10" + "System.Runtime.Loader": "4.0.0" }, "frameworks": { "netstandard1.6": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index ed0a7b253..b89e236d9 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -10,7 +10,7 @@ "Microsoft.DotNet.Compiler.Common": { "target": "project" }, - "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0-beta1-20160610-04" + "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index bf867fffa..bec365156 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -11,7 +11,7 @@ "Newtonsoft.Json": "9.0.1-beta1", "NuGet.Packaging": "3.5.0-beta2-1480", "NuGet.RuntimeModel": "3.5.0-beta2-1480", - "System.Reflection.Metadata": "1.3.0-rc3-24210-10" + "System.Reflection.Metadata": "1.3.0" }, "frameworks": { "net451": { @@ -33,13 +33,13 @@ "dotnet5.4" ], "dependencies": { - "Microsoft.CSharp": "4.0.1-rc3-24210-10", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", - "System.Runtime.Loader": "4.0.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.Security.Cryptography.Algorithms": "4.2.0-rc3-24210-10", - "System.Threading.Thread": "4.0.0-rc3-24210-10", - "System.Xml.XDocument": "4.0.11-rc3-24210-10" + "Microsoft.CSharp": "4.0.1", + "System.Dynamic.Runtime": "4.0.11", + "System.Runtime.Loader": "4.0.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Security.Cryptography.Algorithms": "4.2.0", + "System.Threading.Thread": "4.0.0", + "System.Xml.XDocument": "4.0.11" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 228b15c74..8ec7a11a8 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -16,9 +16,9 @@ "netstandard1.6": { "imports": "portable-net45+wp80+win8+wpa81+dnxcore50", "dependencies": { - "System.Diagnostics.Debug": "4.0.11-rc3-24210-10", - "System.Dynamic.Runtime": "4.0.11-rc3-24210-10", - "System.Linq": "4.1.0-rc3-24210-10" + "System.Diagnostics.Debug": "4.0.11", + "System.Dynamic.Runtime": "4.0.11", + "System.Linq": "4.1.0" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 7d4c3bba9..b096d72e5 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -22,8 +22,8 @@ "portable-net45+win8" ], "dependencies": { - "System.Resources.ResourceManager": "4.0.1-rc3-24210-10", - "System.Reflection.TypeExtensions": "4.1.0-rc3-24210-10" + "System.Resources.ResourceManager": "4.0.1", + "System.Reflection.TypeExtensions": "4.1.0" } } }, diff --git a/src/compilers/project.json b/src/compilers/project.json index dbce8408e..b2b6ed1b8 100644 --- a/src/compilers/project.json +++ b/src/compilers/project.json @@ -6,10 +6,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160610-04", - "Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160610-04", + "Microsoft.CodeAnalysis.CSharp": "1.3.0", + "Microsoft.Net.Compilers.netcore": "1.3.0", "Microsoft.DiaSymReader.Native": "1.4.0-rc2" }, "frameworks": { diff --git a/src/dotnet-archive/project.json b/src/dotnet-archive/project.json index b4f4bcceb..cbd69d99f 100644 --- a/src/dotnet-archive/project.json +++ b/src/dotnet-archive/project.json @@ -14,7 +14,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004449-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index b1cbf583b..adbe7e8f9 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -24,7 +24,7 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index 85f2831fc..ce67b3a46 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -10,7 +10,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "imports": "dnxcore50" diff --git a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template index a4b0be834..6f1ec549e 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Lib/project.json.template @@ -3,12 +3,11 @@ "buildOptions": { "debugType": "portable" }, - "dependencies": { - }, + "dependencies": {}, "frameworks": { "netstandard1.6": { "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-06" + "NETStandard.Library": "1.6.0" } } } diff --git a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template index 1ad68b4a7..eb7568bbe 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, @@ -14,7 +14,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "imports": [ diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index 91d768c92..f101861aa 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -27,7 +27,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "imports": [ diff --git a/src/dotnet/project.json b/src/dotnet/project.json index ce7ff392b..1e2ec0833 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -28,8 +28,8 @@ }, "NuGet.CommandLine.XPlat": "3.5.0-beta2-1480", "Newtonsoft.Json": "9.0.1-beta1", - "System.Text.Encoding.CodePages": "4.0.1-rc3-24210-10", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24210-10", + "System.Text.Encoding.CodePages": "4.0.1", + "System.Diagnostics.FileVersionInfo": "4.0.0", "Microsoft.ApplicationInsights": "2.0.0", "Microsoft.DotNet.ProjectModel": { "target": "project" @@ -48,16 +48,16 @@ }, "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-10", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24210-10", - "System.Resources.Writer": "4.0.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.Private.DataContractSerialization": "4.1.1-rc3-24210-10", - "System.Text.RegularExpressions": "4.1.0-rc3-24210-10", + "System.Diagnostics.TraceSource": "4.0.0", + "System.Diagnostics.TextWriterTraceListener": "4.0.0", + "System.Resources.Writer": "4.0.0", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Private.DataContractSerialization": "4.1.1", + "System.Text.RegularExpressions": "4.1.0", "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24210-10", + "version": "4.0.0", "exclude": "compile" } }, diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index a391c9e5c..0e64842fd 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 88b1ba720..c80d2d28b 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" } }, "frameworks": { diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 8a911c5ab..f03e5cce3 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index b8875c599..74a7a577e 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 88c497746..712001b3a 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -16,10 +16,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Diagnostics.TraceSource": "4.0.0", + "System.Runtime.Serialization.Primitives": "4.1.1", "NuGet.Versioning": "3.5.0-beta2-1480", "NuGet.Packaging": "3.5.0-beta2-1480", "NuGet.Frameworks": "3.5.0-beta2-1480", diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 9bdddafa7..957e27589 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/project.json b/test/Microsoft.DotNet.Configurer.UnitTests/project.json index 2eaaf6fa0..7ec1fe263 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/project.json +++ b/test/Microsoft.DotNet.Configurer.UnitTests/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004442-00" + "version": "1.0.0" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24131-00", + "System.Diagnostics.TraceSource": "4.0.0", "Microsoft.DotNet.Configurer": { "target": "project" }, diff --git a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json index 9458181ef..92cb2447f 100644 --- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.DotNet.ProjectModel.Loader": { "target": "project" diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index b7e04fb6c..83f4d79ed 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -11,9 +11,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index adfcf366d..2a88f7308 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -7,9 +7,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Diagnostics.TraceSource": "4.0.0-rc3-24210-10", + "System.Diagnostics.TraceSource": "4.0.0", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/Performance/project.json b/test/Performance/project.json index 3c79d334f..5eb477030 100644 --- a/test/Performance/project.json +++ b/test/Performance/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index a184d35c6..4bf28a4f4 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.DotNet.ProjectModel": { "target": "project" diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index 5ab96fa2e..b71c3c37e 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -3,12 +3,12 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index c12bbd674..0469b5ce0 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -3,13 +3,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.Diagnostics.Process": "4.1.0-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.Diagnostics.Process": "4.1.0", "TestAppWithPortablePdbs": { "target": "project" }, diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index 47e1d65d8..b599ab10e 100644 --- a/test/TestingAbstractions/TestAppWithFullPdbs/project.json +++ b/test/TestingAbstractions/TestAppWithFullPdbs/project.json @@ -4,7 +4,7 @@ "debugType": "full" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index 2a6dd8615..e39fdbcc7 100644 --- a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json +++ b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json @@ -4,7 +4,7 @@ "debugType": "portable" }, "dependencies": { - "NETStandard.Library": "1.6.0-rc3-24210-10" + "NETStandard.Library": "1.6.0" }, "frameworks": { "netstandard1.5": {} diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json index eb0b4c069..92ef38bb0 100644 --- a/test/binding-redirects.Tests/project.json +++ b/test/binding-redirects.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "Microsoft.NETCore.Platforms": "1.0.1-rc3-24210-10", + "Microsoft.NETCore.Platforms": "1.0.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" } diff --git a/test/crossgen.Tests/project.json b/test/crossgen.Tests/project.json index b5c21fcd0..0ac5ff6e9 100644 --- a/test/crossgen.Tests/project.json +++ b/test/crossgen.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index a2387b9d8..a4de1a1da 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index c9d3584e4..9079e8c82 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index f28ba9181..bd877015e 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index f5a673c55..0dad51a39 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" @@ -23,7 +23,7 @@ "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24210-10", + "version": "4.0.0", "exclude": "Compile" }, "Microsoft.DotNet.ProjectModel": { diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index f80198f9f..92c1c2294 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 508969c37..a6911a7ab 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -3,10 +3,10 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", - "System.IO.Compression.ZipFile": "4.0.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", + "System.IO.Compression.ZipFile": "4.0.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index 7812ce777..c75556768 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,13 +2,13 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24210-10", + "version": "4.0.0", "exclude": "Compile" }, "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -19,7 +19,7 @@ }, "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Net.NameResolution": "4.0.0-rc3-24210-10" + "System.Net.NameResolution": "4.0.0" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index c04255337..05d468142 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.TestFramework": { "target": "project" }, @@ -15,7 +15,7 @@ "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-00206", "dotnet-test-xunit": "1.0.0-rc2-192208-24", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24210-10" + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" }, "frameworks": { "netcoreapp1.0": { diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 7799dc3a8..88f4c8b8c 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index b8875c599..74a7a577e 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-run.UnitTests/project.json b/test/dotnet-run.UnitTests/project.json index 1e3a48024..ec9ab9148 100644 --- a/test/dotnet-run.UnitTests/project.json +++ b/test/dotnet-run.UnitTests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 23296092b..3b0411726 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -3,7 +3,7 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Newtonsoft.Json": "9.0.1-beta1", "Microsoft.DotNet.Tools.Tests.Utilities": { @@ -15,9 +15,9 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "System.Net.NameResolution": "4.0.0-rc3-24210-10", - "System.Net.Sockets": "4.1.0-rc3-24210-10", - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Net.NameResolution": "4.0.0", + "System.Net.Sockets": "4.1.0", + "System.Runtime.Serialization.Primitives": "4.1.1", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index b1723a0bd..8956364bd 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -3,14 +3,14 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, "Newtonsoft.Json": "9.0.1-beta1", "dotnet": { "target": "project" }, "Microsoft.Win32.Registry": { - "version": "4.0.0-rc3-24210-10", + "version": "4.0.0", "exclude": "Compile" }, "xunit": "2.1.0", diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 9e21fa839..66c9d8fed 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -3,9 +3,9 @@ "dependencies": { "Microsoft.NETCore.App": { "type": "platform", - "version": "1.0.0-rc3-004459-00" + "version": "1.0.0" }, - "System.Runtime.Serialization.Primitives": "4.1.1-rc3-24210-10", + "System.Runtime.Serialization.Primitives": "4.1.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/tools/Archiver/project.json b/tools/Archiver/project.json index 07db9fa6e..899fd6995 100644 --- a/tools/Archiver/project.json +++ b/tools/Archiver/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.Archive": { "target": "project" }, - "Microsoft.NETCore.App": "1.0.0-rc3-004442-00" + "Microsoft.NETCore.App": "1.0.0" }, "frameworks": { "netcoreapp1.0": {} diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index da314f5b0..0edf465ca 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.App": "1.0.0-rc3-004459-00", + "Microsoft.NETCore.App": "1.0.0", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From 1a9b16a1ad54aa6c624cb5fd01c0e645ca186ecc Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 14 Jun 2016 03:17:12 -0500 Subject: [PATCH 72/97] Adding dotnet-core feed to the NuGet.config since that has the stable versions of the .NET runtime. --- NuGet.Config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.Config b/NuGet.Config index 55f84e99d..73b213125 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -3,6 +3,7 @@ + From a4cef6d3677ad2c99375f0d7c5541ad8810461f9 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 13 Jun 2016 17:43:10 -0500 Subject: [PATCH 73/97] Updating NuGet to beta2-1484 --- build_projects/dotnet-cli-build/project.json | 2 +- build_projects/update-dependencies/project.json | 2 +- src/Microsoft.DotNet.Cli.Utils/project.json | 8 ++++---- src/Microsoft.DotNet.ProjectModel/project.json | 4 ++-- src/dotnet/project.json | 4 ++-- test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 18f710a24..ff78d04ec 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -13,7 +13,7 @@ "System.Runtime.Serialization.Primitives": "4.1.1", "System.Xml.XmlSerializer": "4.0.11", "WindowsAzure.Storage": "6.2.2-preview", - "NuGet.CommandLine.XPlat": "3.5.0-beta2-1480", + "NuGet.CommandLine.XPlat": "3.5.0-beta2-1484", "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index c386a54f3..ab8b43ba7 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.Cli.Build.Framework": { "target": "project" }, - "NuGet.Versioning": "3.5.0-beta2-1480", + "NuGet.Versioning": "3.5.0-beta2-1484", "Newtonsoft.Json": "9.0.1-beta1", "Octokit": "0.18.0", "Microsoft.Net.Http": "2.2.29" diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index 0502f7d75..f5d94d1d1 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -8,10 +8,10 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "NuGet.Versioning": "3.5.0-beta2-1480", - "NuGet.Packaging": "3.5.0-beta2-1480", - "NuGet.Frameworks": "3.5.0-beta2-1480", - "NuGet.ProjectModel": "3.5.0-beta2-1480" + "NuGet.Versioning": "3.5.0-beta2-1484", + "NuGet.Packaging": "3.5.0-beta2-1484", + "NuGet.Frameworks": "3.5.0-beta2-1484", + "NuGet.ProjectModel": "3.5.0-beta2-1484" }, "frameworks": { "net451": { diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index bec365156..8bee1746c 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -9,8 +9,8 @@ "target": "project" }, "Newtonsoft.Json": "9.0.1-beta1", - "NuGet.Packaging": "3.5.0-beta2-1480", - "NuGet.RuntimeModel": "3.5.0-beta2-1480", + "NuGet.Packaging": "3.5.0-beta2-1484", + "NuGet.RuntimeModel": "3.5.0-beta2-1484", "System.Reflection.Metadata": "1.3.0" }, "frameworks": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 1e2ec0833..5f687b2c8 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -23,10 +23,10 @@ }, "dependencies": { "NuGet.Commands": { - "version": "3.5.0-beta2-1480", + "version": "3.5.0-beta2-1484", "exclude": "compile" }, - "NuGet.CommandLine.XPlat": "3.5.0-beta2-1480", + "NuGet.CommandLine.XPlat": "3.5.0-beta2-1484", "Newtonsoft.Json": "9.0.1-beta1", "System.Text.Encoding.CodePages": "4.0.1", "System.Diagnostics.FileVersionInfo": "4.0.0", diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 712001b3a..e039ceef3 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -20,10 +20,10 @@ }, "System.Diagnostics.TraceSource": "4.0.0", "System.Runtime.Serialization.Primitives": "4.1.1", - "NuGet.Versioning": "3.5.0-beta2-1480", - "NuGet.Packaging": "3.5.0-beta2-1480", - "NuGet.Frameworks": "3.5.0-beta2-1480", - "NuGet.ProjectModel": "3.5.0-beta2-1480", + "NuGet.Versioning": "3.5.0-beta2-1484", + "NuGet.Packaging": "3.5.0-beta2-1484", + "NuGet.Frameworks": "3.5.0-beta2-1484", + "NuGet.ProjectModel": "3.5.0-beta2-1484", "Microsoft.DotNet.ProjectModel": { "target": "project" }, From 635c3331df36e2045dbf25d2f46573537a0f6809 Mon Sep 17 00:00:00 2001 From: jacalvar Date: Mon, 13 Jun 2016 15:06:18 -0700 Subject: [PATCH 74/97] Update to Json.NET 9.0.1 --- build_projects/update-dependencies/project.json | 2 +- src/Microsoft.DotNet.ProjectModel/project.json | 2 +- src/Microsoft.Extensions.DependencyModel/project.json | 2 +- src/Microsoft.Extensions.Testing.Abstractions/project.json | 2 +- src/dotnet/project.json | 2 +- test/dotnet-build.Tests/project.json | 2 +- test/dotnet-new.Tests/project.json | 2 +- test/dotnet-test.Tests/project.json | 2 +- test/dotnet-test.UnitTests/project.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build_projects/update-dependencies/project.json b/build_projects/update-dependencies/project.json index ab8b43ba7..9c9d79edf 100644 --- a/build_projects/update-dependencies/project.json +++ b/build_projects/update-dependencies/project.json @@ -13,7 +13,7 @@ "target": "project" }, "NuGet.Versioning": "3.5.0-beta2-1484", - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "Octokit": "0.18.0", "Microsoft.Net.Http": "2.2.29" }, diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 8bee1746c..bc2e35fc7 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -8,7 +8,7 @@ "Microsoft.Extensions.DependencyModel": { "target": "project" }, - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "NuGet.Packaging": "3.5.0-beta2-1484", "NuGet.RuntimeModel": "3.5.0-beta2-1484", "System.Reflection.Metadata": "1.3.0" diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index 8ec7a11a8..cdaa04b26 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -9,7 +9,7 @@ "Microsoft.DotNet.InternalAbstractions": { "target": "project" }, - "Newtonsoft.Json": "9.0.1-beta1" + "Newtonsoft.Json": "9.0.1" }, "frameworks": { "net451": {}, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index b096d72e5..7fa46aded 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -7,7 +7,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 5f687b2c8..b832a23c1 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -27,7 +27,7 @@ "exclude": "compile" }, "NuGet.CommandLine.XPlat": "3.5.0-beta2-1484", - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "System.Text.Encoding.CodePages": "4.0.1", "System.Diagnostics.FileVersionInfo": "4.0.0", "Microsoft.ApplicationInsights": "2.0.0", diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index a4de1a1da..7da2ca9b7 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.Cli.Utils": { "target": "project" }, - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-rc2-192208-24" }, diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json index 92c1c2294..53784a3a6 100644 --- a/test/dotnet-new.Tests/project.json +++ b/test/dotnet-new.Tests/project.json @@ -8,7 +8,7 @@ "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "dotnet": { "target": "project" }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index 3b0411726..3066cbada 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -5,7 +5,7 @@ "type": "platform", "version": "1.0.0" }, - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 8956364bd..182cde0fe 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -5,7 +5,7 @@ "type": "platform", "version": "1.0.0" }, - "Newtonsoft.Json": "9.0.1-beta1", + "Newtonsoft.Json": "9.0.1", "dotnet": { "target": "project" }, From e3c53c18fdb5429fc7c603712563acd548f3f0e0 Mon Sep 17 00:00:00 2001 From: schellap Date: Sun, 12 Jun 2016 15:33:02 -0700 Subject: [PATCH 75/97] Bring Host FXR MSI --- .../dotnet-cli-build/CliDependencyVersions.cs | 3 ++- build_projects/dotnet-cli-build/MsiTargets.cs | 5 ++++- .../dotnet-cli-build/PrepareTargets.cs | 21 +++++++++++++++++++ packaging/windows/clisdk/bundle.wxs | 3 +++ packaging/windows/clisdk/generatebundle.ps1 | 2 ++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index 9a0adf214..1707298d1 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -12,5 +12,6 @@ namespace Microsoft.DotNet.Cli.Build public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; + public static readonly string HostFxrChannel = "preview"; } -} \ No newline at end of file +} diff --git a/build_projects/dotnet-cli-build/MsiTargets.cs b/build_projects/dotnet-cli-build/MsiTargets.cs index 0f8610f3d..1e7ee4b21 100644 --- a/build_projects/dotnet-cli-build/MsiTargets.cs +++ b/build_projects/dotnet-cli-build/MsiTargets.cs @@ -29,6 +29,8 @@ namespace Microsoft.DotNet.Cli.Build private static string SdkBundle { get; set; } + private static string HostFxrMsi { get; set; } + private static string SharedHostMsi { get; set; } private static string SharedFrameworkMsi { get; set; } @@ -82,6 +84,7 @@ namespace Microsoft.DotNet.Cli.Build SdkEngine = GetEngineName(SdkBundle); SharedFrameworkMsi = Path.ChangeExtension(c.BuildContext.Get("SharedFrameworkInstallerFile"), "msi"); + HostFxrMsi = Path.ChangeExtension(c.BuildContext.Get("HostFxrInstallerFile"), "msi"); SharedHostMsi = Path.ChangeExtension(c.BuildContext.Get("SharedHostInstallerFile"), "msi"); var buildVersion = c.BuildContext.Get("BuildVersion"); @@ -134,7 +137,7 @@ namespace Microsoft.DotNet.Cli.Build Cmd("powershell", "-NoProfile", "-NoLogo", Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatebundle.ps1"), - SdkMsi, SharedFrameworkMsi, SharedHostMsi, SdkBundle, WixRoot, cliSdkBrandName, MsiVersion, CliDisplayVersion, CliNugetVersion, upgradeCode, Arch) + SdkMsi, SharedFrameworkMsi, HostFxrMsi, SharedHostMsi, SdkBundle, WixRoot, cliSdkBrandName, MsiVersion, CliDisplayVersion, CliNugetVersion, upgradeCode, Arch) .EnvironmentVariable("Stage2Dir", Dirs.Stage2) .Execute() .EnsureSuccessful(); diff --git a/build_projects/dotnet-cli-build/PrepareTargets.cs b/build_projects/dotnet-cli-build/PrepareTargets.cs index 98c776947..55a0c00a3 100644 --- a/build_projects/dotnet-cli-build/PrepareTargets.cs +++ b/build_projects/dotnet-cli-build/PrepareTargets.cs @@ -141,6 +141,7 @@ namespace Microsoft.DotNet.Cli.Build var cliVersion = c.BuildContext.Get("BuildVersion").NuGetVersion; var sharedFrameworkVersion = CliDependencyVersions.SharedFrameworkVersion; var hostVersion = CliDependencyVersions.SharedHostVersion; + var hostFxrVersion = CliDependencyVersions.HostFxrVersion; // Generated Installers + Archives AddInstallerArtifactToContext(c, "dotnet-sdk", "Sdk", cliVersion); @@ -150,6 +151,7 @@ namespace Microsoft.DotNet.Cli.Build //Downloaded Installers + Archives AddInstallerArtifactToContext(c, "dotnet-host", "SharedHost", hostVersion); + AddInstallerArtifactToContext(c, "dotnet-hostfxr", "HostFxr", hostFxrVersion); AddInstallerArtifactToContext(c, "dotnet-sharedframework", "SharedFramework", sharedFrameworkVersion); AddInstallerArtifactToContext(c, "dotnet", "CombinedFrameworkHost", sharedFrameworkVersion); @@ -214,15 +216,19 @@ namespace Microsoft.DotNet.Cli.Build var sharedFrameworkVersion = CliDependencyVersions.SharedFrameworkVersion; var hostVersion = CliDependencyVersions.SharedHostVersion; + var hostFxrVersion = CliDependencyVersions.HostFxrVersion; var sharedFrameworkChannel = CliDependencyVersions.SharedFrameworkChannel; var sharedHostChannel = CliDependencyVersions.SharedHostChannel; + var hostFxrChannel = CliDependencyVersions.HostFxrChannel; var sharedFrameworkInstallerDownloadFile = Path.Combine(CliDirs.CoreSetupDownload, "sharedFrameworkInstaller"); var sharedHostInstallerDownloadFile = Path.Combine(CliDirs.CoreSetupDownload, "sharedHostInstaller"); + var hostFxrInstallerDownloadFile = Path.Combine(CliDirs.CoreSetupDownload, "hostFxrInstaller"); Mkdirp(Path.GetDirectoryName(sharedFrameworkInstallerDownloadFile)); Mkdirp(Path.GetDirectoryName(sharedHostInstallerDownloadFile)); + Mkdirp(Path.GetDirectoryName(hostFxrInstallerDownloadFile)); if ( ! File.Exists(sharedFrameworkInstallerDownloadFile)) { @@ -254,6 +260,21 @@ namespace Microsoft.DotNet.Cli.Build File.Copy(sharedHostInstallerDownloadFile, sharedHostInstallerDestinationFile, true); } + if ( ! File.Exists(hostFxrInstallerDownloadFile)) + { + var hostFxrInstallerDestinationFile = c.BuildContext.Get("HostFxrInstallerFile"); + Mkdirp(Path.GetDirectoryName(hostFxrInstallerDestinationFile)); + + AzurePublisher.DownloadFile( + AzurePublisher.CalculateInstallerBlob( + hostFxrInstallerDestinationFile, + hostFxrChannel, + hostFxrVersion), + hostFxrInstallerDownloadFile).Wait(); + + File.Copy(hostFxrInstallerDownloadFile, hostFxrInstallerDestinationFile, true); + } + return c.Success(); } diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs index 4b0bf8577..1ab894dd5 100644 --- a/packaging/windows/clisdk/bundle.wxs +++ b/packaging/windows/clisdk/bundle.wxs @@ -49,6 +49,9 @@ + + + diff --git a/packaging/windows/clisdk/generatebundle.ps1 b/packaging/windows/clisdk/generatebundle.ps1 index fd8084247..948caed91 100644 --- a/packaging/windows/clisdk/generatebundle.ps1 +++ b/packaging/windows/clisdk/generatebundle.ps1 @@ -4,6 +4,7 @@ param( [Parameter(Mandatory=$true)][string]$CLISDKMSIFile, [Parameter(Mandatory=$true)][string]$SharedFxMSIFile, + [Parameter(Mandatory=$true)][string]$HostFxrMSIFile, [Parameter(Mandatory=$true)][string]$SharedHostMSIFile, [Parameter(Mandatory=$true)][string]$DotnetBundleOutput, [Parameter(Mandatory=$true)][string]$WixRoot, @@ -36,6 +37,7 @@ function RunCandleForBundle -dCLISDKMsiSourcePath="$CLISDKMSIFile" ` -dUpgradeCode="$UpgradeCode" ` -dSharedFXMsiSourcePath="$SharedFxMSIFile" ` + -dHostFXRMsiSourcePath="$HostFxrMSIFile" ` -dSharedHostMsiSourcePath="$SharedHostMSIFile" ` -arch "$Architecture" ` -ext WixBalExtension.dll ` From 0f640a32e30122ba201a7bee618fc95194031577 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Thu, 9 Jun 2016 15:45:00 -0700 Subject: [PATCH 76/97] download fxr installer file, use it in pkg targets --- build_projects/dotnet-cli-build/PkgTargets.cs | 10 +++++-- .../Utils/Monikers.cs | 29 ++++--------------- packaging/osx/clisdk/Distribution-Template | 5 ++++ 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/build_projects/dotnet-cli-build/PkgTargets.cs b/build_projects/dotnet-cli-build/PkgTargets.cs index ee93dbb22..4f0e5b639 100644 --- a/build_projects/dotnet-cli-build/PkgTargets.cs +++ b/build_projects/dotnet-cli-build/PkgTargets.cs @@ -20,6 +20,7 @@ namespace Microsoft.DotNet.Cli.Build public static string CLISdkComponentId { get; set; } public static string CLISdkPkgId { get; set; } public static string CLISdkNugetVersion { get; set; } + public static string HostFxrComponentId { get; set; } [Target] [BuildPlatforms(BuildPlatform.OSX)] @@ -29,6 +30,7 @@ namespace Microsoft.DotNet.Cli.Build Directory.CreateDirectory(PkgsIntermediateDir); SharedHostComponentId = $"com.microsoft.dotnet.sharedhost.component.osx.x64"; + HostFxrComponentId = $"com.microsoft.dotnet.hostfxr.component.osx.x64"; string sharedFrameworkNugetName = Monikers.SharedFrameworkName; SharedFrameworkNugetVersion = CliDependencyVersions.SharedFrameworkVersion; @@ -59,10 +61,12 @@ namespace Microsoft.DotNet.Cli.Build // Copy SharedFX and host installers in the correct place var sharedFrameworkPkgIntermediatePath = Path.Combine(PkgsIntermediateDir, $"{SharedFxComponentId}.pkg"); var sharedHostPkgIntermediatePath = Path.Combine(PkgsIntermediateDir, $"{SharedHostComponentId}.pkg"); + var hostFxrPkgIntermediatePath = Path.Combine(PkgsIntermediateDir, $"{HostFxrComponentId}.pkg"); + File.Copy(c.BuildContext.Get("SharedFrameworkInstallerFile"), sharedFrameworkPkgIntermediatePath, true); File.Copy(c.BuildContext.Get("SharedHostInstallerFile"), sharedHostPkgIntermediatePath, true); - + File.Copy(c.BuildContext.Get("HostFxrInstallerFile"), hostFxrPkgIntermediatePath, true); string inputDistTemplatePath = Path.Combine( Dirs.RepoRoot, @@ -75,11 +79,13 @@ namespace Microsoft.DotNet.Cli.Build string formattedDistContents = distTemplate.Replace("{SharedFxComponentId}", SharedFxComponentId) .Replace("{SharedHostComponentId}", SharedHostComponentId) + .Replace("{HostFxrComponentId}", HostFxrComponentId) .Replace("{CLISdkComponentId}", CLISdkComponentId) .Replace("{CLISdkNugetVersion}", CLISdkNugetVersion) .Replace("{CLISdkBrandName}", Monikers.CLISdkBrandName) .Replace("{SharedFxBrandName}", Monikers.SharedFxBrandName) - .Replace("{SharedHostBrandName}", Monikers.SharedHostBrandName); + .Replace("{SharedHostBrandName}", Monikers.SharedHostBrandName) + .Replace("{HostFxrBrandName}", Monikers.HostFxrBrandName); File.WriteAllText(distributionPath, formattedDistContents); Cmd("productbuild", diff --git a/build_projects/shared-build-targets-utils/Utils/Monikers.cs b/build_projects/shared-build-targets-utils/Utils/Monikers.cs index 5358e1ad9..9a90e9cbd 100644 --- a/build_projects/shared-build-targets-utils/Utils/Monikers.cs +++ b/build_projects/shared-build-targets-utils/Utils/Monikers.cs @@ -13,6 +13,7 @@ namespace Microsoft.DotNet.Cli.Build public const string CLISdkBrandName = "Microsoft .NET Core 1.0.0 - SDK Preview 2"; public const string SharedFxBrandName = "Microsoft .NET Core 1.0.0 - Runtime"; public const string SharedHostBrandName = "Microsoft .NET Core 1.0.0 - Host"; + public const string HostFxrBrandName = "Microsoft .NET Core 1.0.0 - Host FX Resolver"; public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version) { @@ -45,29 +46,6 @@ namespace Microsoft.DotNet.Cli.Build return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}"; } - public static string GetDebianPackageName(BuildTargetContext c) - { - var channel = c.BuildContext.Get("Channel").ToLower(); - var packageName = ""; - switch (channel) - { - case "dev": - packageName = "dotnet-nightly"; - break; - case "beta": - case "rc1": - case "rc2": - case "preview": - case "rtm": - packageName = "dotnet"; - break; - default: - throw new Exception($"Unknown channel - {channel}"); - } - - return packageName; - } - public static string GetSdkDebianPackageName(BuildTargetContext c) { var channel = c.BuildContext.Get("Channel").ToLower(); @@ -93,6 +71,11 @@ namespace Microsoft.DotNet.Cli.Build return $"{packagePrefix}-dev-{nugetVersion}"; } + public static string GetDebianHostFxrPackageName(BuildTargetContext c) + { + return $"dotnet-hostfxr".ToLower(); + } + public static string GetDebianSharedFrameworkPackageName(string sharedFrameworkNugetVersion) { return $"dotnet-sharedframework-{SharedFrameworkName}-{sharedFrameworkNugetVersion}".ToLower(); diff --git a/packaging/osx/clisdk/Distribution-Template b/packaging/osx/clisdk/Distribution-Template index 8ec9b852a..24712c285 100644 --- a/packaging/osx/clisdk/Distribution-Template +++ b/packaging/osx/clisdk/Distribution-Template @@ -15,12 +15,16 @@ + + + + @@ -28,6 +32,7 @@ {SharedFxComponentId}.pkg + {HostFxrComponentId}.pkg {SharedHostComponentId}.pkg {CLISdkComponentId}.pkg From 469406de7dbdec697ae05b71a7742519dab1661e Mon Sep 17 00:00:00 2001 From: Senthil Date: Sun, 12 Jun 2016 21:30:03 -0700 Subject: [PATCH 77/97] Fix description of hostfxr --- packaging/osx/clisdk/Distribution-Template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/osx/clisdk/Distribution-Template b/packaging/osx/clisdk/Distribution-Template index 24712c285..d70c70cc4 100644 --- a/packaging/osx/clisdk/Distribution-Template +++ b/packaging/osx/clisdk/Distribution-Template @@ -22,7 +22,7 @@ - + From 716ff73f694d90ce78e5f007646b062aefbe3b47 Mon Sep 17 00:00:00 2001 From: Senthil Date: Mon, 13 Jun 2016 14:40:11 -0700 Subject: [PATCH 78/97] Fix target chaining into hostfxr --- build_projects/dotnet-cli-build/DebTargets.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build_projects/dotnet-cli-build/DebTargets.cs b/build_projects/dotnet-cli-build/DebTargets.cs index 0fab6aa82..d53377873 100644 --- a/build_projects/dotnet-cli-build/DebTargets.cs +++ b/build_projects/dotnet-cli-build/DebTargets.cs @@ -74,8 +74,16 @@ namespace Microsoft.DotNet.Cli.Build return c.Success(); } - + [Target(nameof(InstallSharedHost))] + public static BuildTargetResult InstallHostFxr(BuildTargetContext c) + { + InstallPackage(c.BuildContext.Get("HostFxrInstallerFile")); + + return c.Success(); + } + + [Target(nameof(InstallHostFxr))] public static BuildTargetResult InstallSharedFramework(BuildTargetContext c) { InstallPackage(c.BuildContext.Get("SharedFrameworkInstallerFile")); From a8f05f2914e1965264c956e03cb80390eead17de Mon Sep 17 00:00:00 2001 From: Senthil Date: Mon, 13 Jun 2016 16:39:20 -0700 Subject: [PATCH 79/97] Remove the hostfxr debian target --- build_projects/dotnet-cli-build/DebTargets.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/build_projects/dotnet-cli-build/DebTargets.cs b/build_projects/dotnet-cli-build/DebTargets.cs index d53377873..4ac981374 100644 --- a/build_projects/dotnet-cli-build/DebTargets.cs +++ b/build_projects/dotnet-cli-build/DebTargets.cs @@ -126,6 +126,7 @@ namespace Microsoft.DotNet.Cli.Build { Monikers.GetSdkDebianPackageName(c), Monikers.GetDebianSharedFrameworkPackageName(CliDependencyVersions.SharedFrameworkVersion), + Monikers.GetDebianHostFxrPackageName(c), Monikers.GetDebianSharedHostPackageName(c) }; From 263b80ecbbfda0f65932b225d032e7ee10038725 Mon Sep 17 00:00:00 2001 From: Senthil Date: Mon, 13 Jun 2016 17:33:35 -0700 Subject: [PATCH 80/97] Add HostFXR to UpdateDependencies --- build_projects/update-dependencies/UpdateFilesTargets.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/build_projects/update-dependencies/UpdateFilesTargets.cs b/build_projects/update-dependencies/UpdateFilesTargets.cs index 1156c0b2e..9a0c3053c 100644 --- a/build_projects/update-dependencies/UpdateFilesTargets.cs +++ b/build_projects/update-dependencies/UpdateFilesTargets.cs @@ -221,6 +221,7 @@ namespace Microsoft.DotNet.Scripts ReplaceFileContents(@"build_projects\dotnet-cli-build\CliDependencyVersions.cs", fileContents => { fileContents = ReplaceDependencyVersion(c, fileContents, "SharedFrameworkVersion", "Microsoft.NETCore.App"); + fileContents = ReplaceDependencyVersion(c, fileContents, "HostFxrVersion", "Microsoft.NETCore.DotNetHostResolver"); fileContents = ReplaceDependencyVersion(c, fileContents, "SharedHostVersion", "Microsoft.NETCore.DotNetHost"); return fileContents; From b81ef0fbd65b1da04d0000d1bf58a0688d83496c Mon Sep 17 00:00:00 2001 From: Senthil Date: Mon, 13 Jun 2016 19:17:35 -0700 Subject: [PATCH 81/97] Fix .deb package name to include versions --- build_projects/dotnet-cli-build/DebTargets.cs | 2 +- build_projects/shared-build-targets-utils/Utils/Monikers.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_projects/dotnet-cli-build/DebTargets.cs b/build_projects/dotnet-cli-build/DebTargets.cs index 4ac981374..9f8ba6876 100644 --- a/build_projects/dotnet-cli-build/DebTargets.cs +++ b/build_projects/dotnet-cli-build/DebTargets.cs @@ -126,7 +126,7 @@ namespace Microsoft.DotNet.Cli.Build { Monikers.GetSdkDebianPackageName(c), Monikers.GetDebianSharedFrameworkPackageName(CliDependencyVersions.SharedFrameworkVersion), - Monikers.GetDebianHostFxrPackageName(c), + Monikers.GetDebianHostFxrPackageName(CliDependencyVersions.HostFxrVersion), Monikers.GetDebianSharedHostPackageName(c) }; diff --git a/build_projects/shared-build-targets-utils/Utils/Monikers.cs b/build_projects/shared-build-targets-utils/Utils/Monikers.cs index 9a90e9cbd..b9f8ef2d5 100644 --- a/build_projects/shared-build-targets-utils/Utils/Monikers.cs +++ b/build_projects/shared-build-targets-utils/Utils/Monikers.cs @@ -71,9 +71,9 @@ namespace Microsoft.DotNet.Cli.Build return $"{packagePrefix}-dev-{nugetVersion}"; } - public static string GetDebianHostFxrPackageName(BuildTargetContext c) + public static string GetDebianHostFxrPackageName(string hostFxrNugetVersion) { - return $"dotnet-hostfxr".ToLower(); + return $"dotnet-hostfxr-{hostFxrNugetVersion}".ToLower(); } public static string GetDebianSharedFrameworkPackageName(string sharedFrameworkNugetVersion) From 9b1415d8601b4c8841e992c4f0497efc972084a6 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Tue, 14 Jun 2016 02:19:32 -0700 Subject: [PATCH 82/97] Update FSharp Test Assets to preview2 --- .../TestProjects/FSharpTestProjects/CompileFailApp/project.json | 2 +- TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json | 2 +- .../FSharpTestProjects/TestAppWithArgs/project.json | 2 +- .../TestProjects/FSharpTestProjects/TestLibrary/project.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index 6bbb1f258..e921509fd 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -15,7 +15,7 @@ }, "tools": { "dotnet-compile-fsc": { - "version": "1.0.0-*", + "version": "1.0.0-preview2-*", "imports": [ "dnxcore50", "portable-net45+win81", diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index c624d6511..38edb80f0 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -19,7 +19,7 @@ }, "tools": { "dotnet-compile-fsc": { - "version": "1.0.0-*", + "version": "1.0.0-preview2-*", "imports": [ "dnxcore50", "portable-net45+win81", diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 466d60006..8d67aa116 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -15,7 +15,7 @@ }, "tools": { "dotnet-compile-fsc": { - "version": "1.0.0-*", + "version": "1.0.0-preview2-*", "imports": [ "dnxcore50", "portable-net45+win81", diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index 89ad68468..e72b8a8fa 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json @@ -6,7 +6,7 @@ }, "tools": { "dotnet-compile-fsc": { - "version": "1.0.0-*", + "version": "1.0.0-preview2-*", "imports": [ "dnxcore50", "portable-net45+win81", From 2663d03dc9cd8f066e32cdda333aa77a407e505b Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Tue, 14 Jun 2016 02:21:59 -0700 Subject: [PATCH 83/97] Fix cherrypick error --- build_projects/dotnet-cli-build/CliDependencyVersions.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/build_projects/dotnet-cli-build/CliDependencyVersions.cs b/build_projects/dotnet-cli-build/CliDependencyVersions.cs index 1707298d1..c2b8a859b 100644 --- a/build_projects/dotnet-cli-build/CliDependencyVersions.cs +++ b/build_projects/dotnet-cli-build/CliDependencyVersions.cs @@ -9,6 +9,7 @@ namespace Microsoft.DotNet.Cli.Build { public static readonly string SharedFrameworkVersion = "1.0.0"; public static readonly string SharedHostVersion = "1.0.1"; + public static readonly string HostFxrVersion = "1.0.1"; public static readonly string SharedFrameworkChannel = "preview"; public static readonly string SharedHostChannel = "preview"; From f75ee876d8ecb3302dc0a8763f7b288dc1656b10 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Mon, 13 Jun 2016 19:08:54 -0700 Subject: [PATCH 84/97] Enable ubuntu16 deb creation and publishing --- build_projects/dotnet-cli-build/DebTargets.cs | 78 +++++++++++++++++-- .../dotnet-cli-build/PrepareTargets.cs | 5 -- .../dotnet-cli-build/PublishTargets.cs | 6 +- scripts/docker/ubuntu.16.04/Dockerfile | 3 +- 4 files changed, 78 insertions(+), 14 deletions(-) diff --git a/build_projects/dotnet-cli-build/DebTargets.cs b/build_projects/dotnet-cli-build/DebTargets.cs index 9f8ba6876..8a362ba6c 100644 --- a/build_projects/dotnet-cli-build/DebTargets.cs +++ b/build_projects/dotnet-cli-build/DebTargets.cs @@ -13,16 +13,25 @@ namespace Microsoft.DotNet.Cli.Build public class DebTargets { [Target(nameof(GenerateSdkDeb))] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult GenerateDebs(BuildTargetContext c) { return c.Success(); } [Target(nameof(InstallSharedFramework))] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult GenerateSdkDeb(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + var channel = c.BuildContext.Get("Channel").ToLower(); var packageName = Monikers.GetSdkDebianPackageName(c); var version = c.BuildContext.Get("BuildVersion").NuGetVersion; @@ -61,7 +70,7 @@ namespace Microsoft.DotNet.Cli.Build [Target(nameof(InstallSDK), nameof(RunE2ETest), nameof(RemovePackages))] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult TestDebInstaller(BuildTargetContext c) { return c.Success(); @@ -70,6 +79,15 @@ namespace Microsoft.DotNet.Cli.Build [Target] public static BuildTargetResult InstallSharedHost(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + InstallPackage(c.BuildContext.Get("SharedHostInstallerFile")); return c.Success(); @@ -78,6 +96,15 @@ namespace Microsoft.DotNet.Cli.Build [Target(nameof(InstallSharedHost))] public static BuildTargetResult InstallHostFxr(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + InstallPackage(c.BuildContext.Get("HostFxrInstallerFile")); return c.Success(); @@ -86,6 +113,15 @@ namespace Microsoft.DotNet.Cli.Build [Target(nameof(InstallHostFxr))] public static BuildTargetResult InstallSharedFramework(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + InstallPackage(c.BuildContext.Get("SharedFrameworkInstallerFile")); return c.Success(); @@ -94,15 +130,33 @@ namespace Microsoft.DotNet.Cli.Build [Target(nameof(InstallSharedFramework))] public static BuildTargetResult InstallSDK(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + InstallPackage(c.BuildContext.Get("SdkInstallerFile")); return c.Success(); } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult RunE2ETest(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + Directory.SetCurrentDirectory(Path.Combine(Dirs.RepoRoot, "test", "EndToEnd")); Cmd("dotnet", "build") @@ -119,9 +173,18 @@ namespace Microsoft.DotNet.Cli.Build } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult RemovePackages(BuildTargetContext c) { + // Ubuntu 16.04 Jenkins Machines don't have docker or debian package build tools + // So we need to skip this target if the tools aren't present. + // https://github.com/dotnet/core-setup/issues/167 + if (DebuildNotPresent()) + { + c.Info("Debuild not present, skipping target: {nameof(RemovePackages)}"); + return c.Success(); + } + IEnumerable orderedPackageNames = new List() { Monikers.GetSdkDebianPackageName(c), @@ -151,5 +214,10 @@ namespace Microsoft.DotNet.Cli.Build .Execute() .EnsureSuccessful(); } + + private static bool DebuildNotPresent() + { + return Cmd("/usr/bin/env", "debuild", "-h").Execute().ExitCode != 0; + } } } diff --git a/build_projects/dotnet-cli-build/PrepareTargets.cs b/build_projects/dotnet-cli-build/PrepareTargets.cs index 55a0c00a3..5e6b94854 100644 --- a/build_projects/dotnet-cli-build/PrepareTargets.cs +++ b/build_projects/dotnet-cli-build/PrepareTargets.cs @@ -209,11 +209,6 @@ namespace Microsoft.DotNet.Cli.Build [BuildPlatforms(BuildPlatform.Windows, BuildPlatform.OSX, BuildPlatform.Ubuntu)] public static BuildTargetResult DownloadHostAndSharedFxInstallers(BuildTargetContext c) { - if (CurrentPlatform.IsUbuntu && !CurrentPlatform.IsVersion("14.04")) - { - return c.Success(); - } - var sharedFrameworkVersion = CliDependencyVersions.SharedFrameworkVersion; var hostVersion = CliDependencyVersions.SharedHostVersion; var hostFxrVersion = CliDependencyVersions.HostFxrVersion; diff --git a/build_projects/dotnet-cli-build/PublishTargets.cs b/build_projects/dotnet-cli-build/PublishTargets.cs index 984ae2840..6c367534f 100644 --- a/build_projects/dotnet-cli-build/PublishTargets.cs +++ b/build_projects/dotnet-cli-build/PublishTargets.cs @@ -196,7 +196,7 @@ namespace Microsoft.DotNet.Cli.Build [Target( nameof(PublishSdkDebToDebianRepo))] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult PublishDebFilesToDebianRepo(BuildTargetContext c) { return c.Success(); @@ -212,7 +212,7 @@ namespace Microsoft.DotNet.Cli.Build } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult PublishSdkInstallerFileToAzure(BuildTargetContext c) { var version = CliNuGetVersion; @@ -270,7 +270,7 @@ namespace Microsoft.DotNet.Cli.Build } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] + [BuildPlatforms(BuildPlatform.Ubuntu)] public static BuildTargetResult PublishSdkDebToDebianRepo(BuildTargetContext c) { var version = CliNuGetVersion; diff --git a/scripts/docker/ubuntu.16.04/Dockerfile b/scripts/docker/ubuntu.16.04/Dockerfile index a101e49ba..fa7cf4ccc 100644 --- a/scripts/docker/ubuntu.16.04/Dockerfile +++ b/scripts/docker/ubuntu.16.04/Dockerfile @@ -28,7 +28,8 @@ RUN apt-get install -y libunwind8 \ liblttng-ust0 \ libssl1.0.0 \ zlib1g \ - libuuid1 && \ + libuuid1 \ + liblldb-3.6 && \ apt-get clean # Setup User to match Host User, and give superuser permissions From 277b2e7a0dfa3ed8090848c1b29e581b64fabab0 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Tue, 14 Jun 2016 02:41:47 -0700 Subject: [PATCH 85/97] re-enable first time experience for the first-time experience tests --- .../GivenThatTheUserIsRunningDoNetForTheFirstTime.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs index c08442d86..5df9c2c8b 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDoNetForTheFirstTime.cs @@ -26,6 +26,7 @@ namespace Microsoft.DotNet.Tests var command = new DotnetCommand() .WithWorkingDirectory(testDirectory.Path); command.Environment["NUGET_PACKAGES"] = testNugetCache; + command.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = ""; _firstDotnetUseCommandResult = command.ExecuteWithCapturedOutput("new"); From 9e97d0400ca7f8f7a2b4162bbf83e77c69c1fc29 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Tue, 14 Jun 2016 03:31:22 -0700 Subject: [PATCH 86/97] dotnet-compile-fsc bump to latest --- .../TestProjects/FSharpTestProjects/CompileFailApp/project.json | 2 +- TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json | 2 +- .../FSharpTestProjects/TestAppWithArgs/project.json | 2 +- .../TestProjects/FSharpTestProjects/TestLibrary/project.json | 2 +- src/dotnet-compile-fsc/project.json | 2 +- .../commands/dotnet-new/FSharp_Console/project.json.template | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json index e921509fd..e29c14026 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json @@ -10,7 +10,7 @@ } }, "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509", "Microsoft.NETCore.App": "1.0.0" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json index 38edb80f0..8127db1bc 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json @@ -15,7 +15,7 @@ "target": "project" }, "Microsoft.NETCore.App": "1.0.0", - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221" + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509" }, "tools": { "dotnet-compile-fsc": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json index 8d67aa116..0f1c4b84c 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json @@ -10,7 +10,7 @@ } }, "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509", "Microsoft.NETCore.App": "1.0.0" }, "tools": { diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json index e72b8a8fa..fff7c8bfb 100644 --- a/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json @@ -1,7 +1,7 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", + "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509", "NETStandard.Library": "1.6.0" }, "tools": { diff --git a/src/dotnet-compile-fsc/project.json b/src/dotnet-compile-fsc/project.json index adbe7e8f9..1316b760b 100644 --- a/src/dotnet-compile-fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -12,7 +12,7 @@ } }, "dependencies": { - "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160318", + "Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-160509", "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index f101861aa..f2c366a2a 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -14,7 +14,7 @@ }, "tools": { "dotnet-compile-fsc": { - "version": "1.0.0-*", + "version": "1.0.0-preview2-*", "imports": [ "dnxcore50", "portable-net45+win81", From 4da4f95e21a36df406c397b18be504b69337e606 Mon Sep 17 00:00:00 2001 From: Zlatko Knezevic Date: Tue, 14 Jun 2016 06:42:21 -0700 Subject: [PATCH 87/97] Update documentation (#3549) * Updating README.md files as well as man pages This aligns with the latest changes in the official documentation. It also aligns dotnet test readme.md to official docs and introduces a new doc in the "Documentation" directory that deals with dotnet test protocols. --- Documentation/dotnet-test-protocol.md | 44 +++++ Documentation/manpages/sdk/dotnet-build.1 | 96 ++++++++++ Documentation/manpages/sdk/dotnet-new.1 | 67 +++++-- Documentation/manpages/sdk/dotnet-pack.1 | 91 +++++++++ Documentation/manpages/sdk/dotnet-publish.1 | 183 +++++++++---------- Documentation/manpages/sdk/dotnet-restore.1 | 97 ++++++++++ Documentation/manpages/sdk/dotnet-run.1 | 96 +++++++--- Documentation/manpages/sdk/dotnet-test.1 | 170 +++++++++++++++++ src/dotnet/README.md | 96 +++++----- src/dotnet/commands/dotnet-build/README.md | 46 ++--- src/dotnet/commands/dotnet-new/README.md | 17 +- src/dotnet/commands/dotnet-pack/README.md | 62 +++---- src/dotnet/commands/dotnet-publish/README.md | 55 +++--- src/dotnet/commands/dotnet-restore/README.md | 63 +++---- src/dotnet/commands/dotnet-run/README.md | 53 ++++-- src/dotnet/commands/dotnet-test/readme.md | 139 ++++++++------ 16 files changed, 971 insertions(+), 404 deletions(-) create mode 100644 Documentation/dotnet-test-protocol.md create mode 100644 Documentation/manpages/sdk/dotnet-build.1 create mode 100644 Documentation/manpages/sdk/dotnet-pack.1 create mode 100644 Documentation/manpages/sdk/dotnet-restore.1 create mode 100644 Documentation/manpages/sdk/dotnet-test.1 diff --git a/Documentation/dotnet-test-protocol.md b/Documentation/dotnet-test-protocol.md new file mode 100644 index 000000000..14c96dee0 --- /dev/null +++ b/Documentation/dotnet-test-protocol.md @@ -0,0 +1,44 @@ +dotnet-test communication protocol +=================================== + +## Introduction +Anytime you pass a port to dotnet test, the command will run in design time. That means that dotnet test will connect to that port +using TCP and will then exchange an established set of messages with whatever else is connected to that port. When this happens, the runner +also receives a new port that dotnet test will use to communicate with it. The reason why the runner also uses TCP to +communicate with dotnet test is because in design mode, it is not sufficient to just output results to the console. The +command needs to send the adapter structure messages containing the results of the test execution. + +### Communication protocol at design time. + +1. Because during design time, dotnet test connects to a port when it starts up, the adapter needs to be listening on +that port otherwise dotnet test will fail. We did it like this so that the adapter could reserve all the ports it needs +by binding and listening to them before dotnet test ran and tried to get ports for the runner. +2. Once dotnet test starts, it sends a TestSession.Connected message to the adapter indicating that it is ready to receive messages. +3. It is possible to send an optional +[version check](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Messages/ProtocolVersionMessage.cs) +message with the adapter version of the protocol in it. Dotnet test will send back the version of the protocol that it supports. + +All messages have the format described here: +[Message.cs](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Messages/Message.cs). +The payload formats for each message is described in links to the classes used to serialize/deseralize the information in the description of the protocol. + +#### Test Execution +![alt tag](../../../images/DotnetTestExecuteTests.png) + +1. After the optional version check, the adapter sends a TestExecution.GetTestRunnerProcessStartInfo, with the +[tests](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Messages/RunTestsMessage.cs) it wants to execute inside of it. Dotnet test sends back a FileName and Arguments inside a [TestStartInfo](https://github.com/dotnet/cli/blob/rel/1.0.0/src/dotnet/commands/dotnet-test/TestStartInfo.cs) payload that the adapter can use to start the runner. In the past, we would send the list of tests to run as part of that argument, but we were actually going over the command line size limit for some test projects. + 1. As part of the arguments, we send a port that the runner should connect to and for executing tests, a --wait-command flag, that indicates that the runner should connect to the port and wait for commands, instead of going ahead and executing the tests. +2. At this point, the adapter can launch the runner (and attach to it for debugging if it chooses to). +3. Once the runner starts, it sends dotnet test a TestRunner.WaitCommand message that indicates it is ready to receive commands, at which point dotnet test sends a TestRunner.Execute with the list of [tests](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Messages/RunTestsMessage.cs) to run. This bypasses the command line size limit described above. +4. The runner then sends dotnet test (and it passes forward to the adapter) a TestExecution.TestStarted for each tests as they start with the [test](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Test.cs) information inside of it. +5. The runner also sends dotnet test (and it forwards to the adapter) a TestExecution.TestResult for each test with the [individual result](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/TestResult.cs) of the test. +6. After all tests finish, the runner sends a TestRunner.Completed message to dotnet test, which dotnet test sends as TestExecution.Completed to the adapter. +7. Once the adapter is done, it sends dotnet test a TestSession.Terminate which will cause dotnet test to shutdown. + +#### Test discovery +![alt tag](../../../images/DotnetTestDiscoverTests.png) + +1. After the optional version check, the adapter sends a TestDiscovery.Start message. Because in this case, the adapter does not need to attach to the process, dotnet test will start the runner itself. Also, since there is no long list of arguments to be passed to the runner, no --wait-command flag is needed to be passed to the runner. dotnet test only passes a --list argument to the runner, which means the runner should not run the tests, just list them. +2. The runner then sends dotnet test (and it passes forward to the adapter) a TestDiscovery.TestFound for each [test](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Test.cs) found. +3. After all tests are discovered, the runner sends a TestRunner.Completed message to dotnet test, which dotnet test sends as TestDiscovery.Completed to the adapter. +4. Once the adapter is done, it sends dotnet test a TestSession.Terminate which will cause dotnet test to shutdown. diff --git a/Documentation/manpages/sdk/dotnet-build.1 b/Documentation/manpages/sdk/dotnet-build.1 new file mode 100644 index 000000000..1cbb21fb7 --- /dev/null +++ b/Documentation/manpages/sdk/dotnet-build.1 @@ -0,0 +1,96 @@ +.\" Automatically generated by Pandoc 1.15.1 +.\" +.hy +.TH "DOTNET\-BUILD" "1" "April 2016" "" "" +.SS NAME +.PP +dotnet\-build \-\- Builds a project and all of its dependencies +.SS SYNOPSIS +.PP +\f[C]dotnet\ build\ [\-\-output]\ \ \ \ \ \ \ [\-\-build\-base\-path]\ [\-\-framework]\ \ \ \ \ \ \ [\-\-configuration]\ \ [\-\-runtime]\ [\-\-version\-suffix]\ \ \ \ \ [\-\-build\-profile]\ \ [\-\-no\-incremental]\ [\-\-no\-dependencies]\ \ \ \ \ []\f[] +.SS DESCRIPTION +.PP +The \f[C]dotnet\ build\f[] command builds multiple source file from a +source project and its dependencies into a binary. +The binary will be in Intermediate Language (IL) by default and will +have a DLL extension. +\f[C]dotnet\ build\f[] will also drop a \f[C]\\*.deps\f[] file which +outlines what the host needs to run the application. +.PP +Building requires the existence of a lock file, which means that you +have to run \f[C]dotnet\ restore\f[] (dotnet-restore.md) prior to +building your code. +.PP +Before any compilation begins, the build verb analyzes the project and +its dependencies for incremental safety checks. +If all checks pass, then build proceeds with incremental compilation of +the project and its dependencies; otherwise, it falls back to +non\-incremental compilation. +Via a profile flag, users can choose to receive additional information +on how they can improve their build times. +.PP +All projects in the dependency graph that need compilation must pass the +following safety checks in order for the compilation process to be +incremental: \- not use pre/post compile scripts \- not load compilation +tools from PATH (for example, resgen, compilers) \- use only known +compilers (csc, vbc, fsc) +.PP +In order to build an executable application, you need a special +configuration section in your project.json file: +.IP +.nf +\f[C] +{\ +\ \ \ \ "compilerOptions":\ { +\ \ \ \ \ \ "emitEntryPoint":\ true +\ \ \ \ } +} +\f[] +.fi +.SS OPTIONS +.PP +\f[C]\-o\f[], \f[C]\-\-output\f[] [DIR] +.PP +Directory in which to place the built binaries. +.PP +\f[C]\-b\f[], \f[C]\-\-build\-base\-path\f[] [DIR] +.PP +Directory in which to place temporary outputs. +.PP +\f[C]\-f\f[], \f[C]\-\-framework\f[] [FRAMEWORK] +.PP +Compiles for a specific framework. +The framework needs to be defined in the project.json file. +.PP +\f[C]\-c\f[], \f[C]\-\-configuration\f[] [Debug|Release] +.PP +Defines a configuration under which to build. +If omitted, it defaults to Debug. +.PP +\f[C]\-r\f[], \f[C]\-\-runtime\f[] [RUNTIME_IDENTIFIER] +.PP +Target runtime to build for. +.PP +\-\-version\-suffix [VERSION_SUFFIX] +.PP +Defines what \f[C]*\f[] should be replaced with in the version field in +the project.json file. +The format follows NuGet\[aq]s version guidelines. +.PP +\f[C]\-\-build\-profile\f[] +.PP +Prints out the incremental safety checks that users need to address in +order for incremental compilation to be automatically turned on. +.PP +\f[C]\-\-no\-incremental\f[] +.PP +Marks the build as unsafe for incremental build. +This turns off incremental compilation and forces a clean rebuild of the +project dependency graph. +.PP +\f[C]\-\-no\-dependencies\f[] +.PP +Ignores project\-to\-project references and only builds the root project +specified to build. +.SH AUTHORS +Microsoft Corporation dotnetclifeedback\@microsoft.com. diff --git a/Documentation/manpages/sdk/dotnet-new.1 b/Documentation/manpages/sdk/dotnet-new.1 index f201c3794..5dfdbd490 100644 --- a/Documentation/manpages/sdk/dotnet-new.1 +++ b/Documentation/manpages/sdk/dotnet-new.1 @@ -1,38 +1,81 @@ .\" Automatically generated by Pandoc 1.15.1 .\" .hy -.TH "dotnet-new" "1" "January 2016" "" "" -.SH NAME +.TH "DOTNET\-NEW" "1" "June 2016" "" "" +.SS NAME .PP dotnet\-new \-\- Create a new sample .NET Core project -.SH SYNOPSIS +.SS SYNOPSIS .PP -dotnet new -.SH DESCRIPTION +dotnet new [\-\-type] [\-\-lang] +.SS DESCRIPTION .PP -The new command provides a convenient way to initalize a valid .NET Core -project and sample source code to try out the CLI toolset. +The \f[C]dotnet\ new\f[] command provides a convenient way to initialize +a valid .NET Core project and sample source code to try out the Command +Line Interface (CLI) toolset. .PP This command is invoked in the context of a directory. When invoked, the command will result in two main artifacts being dropped to the directory: .IP "1." 3 -A sample "Hello World" program that exists in \f[C]Program.cs\f[] file. +A \f[C]Program.cs\f[] (or \f[C]Program.fs\f[]) file that contains a +sample "Hello World" program. .IP "2." 3 -A valid \f[C]project.json\f[] file +A valid \f[C]project.json\f[] file. .PP After this, the project is ready to be compiled and/or edited further. -.SH EXAMPLES +.SS Options +.PP +\f[C]\-l\f[], \f[C]\-\-lang\ [C#|F#]\f[] +.PP +Language of the project. +Defaults to \f[C]C#\f[]. +\f[C]csharp\f[] (\f[C]fsharp\f[]) or \f[C]cs\f[] (\f[C]fs\f[]) are also +valid options. +.PP +\f[C]\-t\f[], \f[C]\-\-type\f[] +.PP +Type of the project. +Valid values for C# are: +.IP \[bu] 2 +\f[C]console\f[] +.IP \[bu] 2 +\f[C]web\f[] +.IP \[bu] 2 +\f[C]lib\f[] +.IP \[bu] 2 +\f[C]xunittest\f[] +.PP +Valid values for F# are: +.IP \[bu] 2 +\f[C]console\f[] +.SS EXAMPLES .PP \f[C]dotnet\ new\f[] .IP .nf \f[C] -Drops\ a\ sample\ in\ the\ current\ directory. +Drops\ a\ sample\ C##\ project\ in\ the\ current\ directory. +\f[] +.fi +.PP +\f[C]dotnet\ new\ \-\-lang\ f##\f[] +.IP +.nf +\f[C] +Drops\ a\ sample\ F##\ project\ in\ the\ current\ directory. +\f[] +.fi +.PP +\f[C]dotnet\ new\ \-\-lang\ c##\f[] +.IP +.nf +\f[C] +Drops\ a\ sample\ C##\ project\ in\ the\ current\ directory. \f[] .fi .SH SEE ALSO .PP dotnet\-run(1) .SH AUTHORS -Zlatko Knezevic zlakne\@microsoft.com. +Microsoft Corporation dotnetclifeedback\@microsoft.com. diff --git a/Documentation/manpages/sdk/dotnet-pack.1 b/Documentation/manpages/sdk/dotnet-pack.1 new file mode 100644 index 000000000..6cb751efd --- /dev/null +++ b/Documentation/manpages/sdk/dotnet-pack.1 @@ -0,0 +1,91 @@ +.\" Automatically generated by Pandoc 1.15.1 +.\" +.hy +.TH "DOTNET\-PACK" "1" "June 2016" "" "" +.SS NAME +.PP +\f[C]dotnet\-pack\f[] \- Packs the code into a NuGet package +.SS SYNOPSIS +.PP +\f[C]dotnet\ pack\ [\-\-output]\ \ \ \ \ \ \ [\-\-no\-build]\ [\-\-build\-base\-path]\ \ \ \ \ \ \ [\-\-configuration]\ \ [\-\-version\-suffix]\ \ \ \ \ []\f[] +.SS DESCRIPTION +.PP +The \f[C]dotnet\ pack\f[] command builds the project and creates NuGet +packages. +The result of this operation is two packages with the \f[C]nupkg\f[] +extension. +One package contains the code and the other contains the debug symbols. +.PP +NuGet dependencies of the project being packed are added to the nuspec +file, so they are able to be resolved when the package is installed. +Project\-to\-project references are not packaged inside the project by +default. +If you wish to do this, you need to reference the required project in +your dependencies node with a \f[C]type\f[] set to "build" like in the +following example: +.IP +.nf +\f[C] +{ +\ \ \ \ "version":\ "1.0.0\-*", +\ \ \ \ "dependencies":\ { +\ \ \ \ \ \ \ \ "ProjectA":\ { +\ \ \ \ \ \ \ \ \ \ \ \ "target":\ "project", +\ \ \ \ \ \ \ \ \ \ \ \ "type":\ "build" +\ \ \ \ \ \ \ \ } +\ \ \ \ } +} +\f[] +.fi +.PP +\f[C]dotnet\ pack\f[] by default first builds the project. +If you wish to avoid this, pass the \f[C]\-\-no\-build\f[] option. +This can be useful in Continuous Integration (CI) build scenarios in +which you know the code was just previously built, for example. +.SS OPTIONS +.PP +\f[C][project]\f[] +.PP +The project to pack. +It can be either a path to a \f[C]project.json\f[] file or to a +directory. +If omitted, it will default to the current directory. +.PP +\f[C]\-o\f[], \f[C]\-\-output\f[] [DIR] +.PP +Places the built packages in the directory specified. +.PP +\f[C]\-\-no\-build\f[] +.PP +Skips the building phase of the packing process. +.PP +\f[C]\-\-build\-base\-path\f[] +.PP +Places the temporary build artifacts in the specified directory. +By default, they go to the obj directory in the current directory. +.PP +\f[C]\-c\f[], \f[C]\-\-configuration\ [Debug|Release]\f[] +.PP +Configuration to use when building the project. +If not specified, will default to "Debug". +.SS EXAMPLES +.PP +\f[C]dotnet\ pack\f[] +.PP +Packs the current project. +.PP +\f[C]dotnet\ pack\ ~/projects/app1/project.json\f[] +.PP +Packs the app1 project. +.PP +\f[C]dotnet\ pack\ \-\-output\ nupkgs\f[] +.PP +Packs the current application and place the resulting packages into the +specified folder. +.PP +\f[C]dotnet\ pack\ \-\-no\-build\ \-\-output\ nupkgs\f[] +.PP +Packs the current project into the specified folder and skips the build +step. +.SH AUTHORS +Microsoft Corporation dotnetclifeedback\@microsoft.com. diff --git a/Documentation/manpages/sdk/dotnet-publish.1 b/Documentation/manpages/sdk/dotnet-publish.1 index 4464ac0d2..40393ec2a 100644 --- a/Documentation/manpages/sdk/dotnet-publish.1 +++ b/Documentation/manpages/sdk/dotnet-publish.1 @@ -1,122 +1,107 @@ .\" Automatically generated by Pandoc 1.15.1 .\" .hy -.TH "dotnet-publish" "1" "January 2016" "" "" -.SH NAME +.TH "DOTNET\-PUBLISH" "1" "June 2016" "" "" +.SS NAME .PP -\f[C]dotnet\-publish\f[] \- packs the application and all of its +\f[C]dotnet\-publish\f[] \- Packs the application and all of its dependencies into a folder getting it ready for publishing -.SH SYNOPSIS +.SS SYNOPSIS .PP -dotnet\-publish [\-\-framework] [\-\-runtime] [\-\-output] -[\-\-configuration] +\f[C]dotnet\ publish\ [\-\-framework]\ \ \ \ \ \ \ [\-\-runtime]\ [\-\-build\-base\-path]\ [\-\-output]\ \ \ \ \ \ \ [\-\-version\-suffix]\ [\-\-configuration]\ \ \ \ \ \ \ []\f[] +.SS DESCRIPTION +.PP +\f[C]dotnet\ publish\f[] compiles the application, reads through its +dependencies specified in the \f[C]project.json\f[] file and publishes +the resulting set of files to a directory. +.PP +Depending on the type of portable app, the resulting directory will +contain the following: +.IP "1." 3 +\f[B]Portable application\f[] \- application\[aq]s intermediate language +(IL) code and all of application\[aq]s managed dependencies. +.RS 4 +.IP \[bu] 2 +\f[B]Portable application with native dependencies\f[] \- same as above +with a sub\-directory for the supported platform of each native +dependency. +.RE +.IP "2." 3 +\f[B]Self\-contained application\f[] \- same as above plus the entire +runtime for the targeted platform. +.PP +The above types are covered in more details in the types of portable +applications (../../app-types.md) topic. +.SS OPTIONS +.PP +\f[C][project]\f[] +.PP +\f[C]dotnet\ publish\f[] needs access to the \f[C]project.json\f[] file +to work. +If it is not specified on invocation via [project], +\f[C]project.json\f[] in the current directory will be the default. .PD 0 .P .PD -[< project >] -.SH DESCRIPTION -.PP -\f[C]dotnet\-publish\f[] will compile the application, read through its -dependencies specified in \f[C]project.json\f[] and publish the -resulting set of files to a directory. -This directory will contain the assemblies, the runtime as well as the -executable version of the application. -This directory can then be moved to a different machine and the -application will be able to run regardless of existence of any other -runtime. -.PP -The native dependencies of the runtime are not packaged with the -application. -This means that the target machine needs to have the native dependencies -installed in order for the application to run. -.SH OPTIONS -.PP -\f[C][project]\f[] -.IP -.nf -\f[C] -`dotnet\-publish`\ needs\ access\ to\ `project.json`\ to\ work.\ If\ it\ is\ not\ specified\ on\ invocation\ via\ [project],\ `project.json`\ in\ the\ current\ directory\ will\ be\ the\ default.\ \ \ \ \ If\ no\ `project.json`\ can\ be\ found,\ `dotnet\-publish`\ will\ error\ out.\ `dotnet\-publish`\ command\ also\ requires\ certain\ dependencies\ in\ the\ `project.json`\ to\ work.\ Namely\ the\ `Microsoft.NETCore.Runtime`\ package\ must\ be\ referenced\ as\ a\ dependency\ in\ order\ for\ the\ command\ to\ copy\ the\ runtime\ files\ as\ well\ as\ the\ application\[aq]s\ files\ to\ the\ published\ location.\ \ -\f[] -.fi +If no \f[C]project.json\f[] can be found, \f[C]dotnet\ publish\f[] will +throw an error. .PP \f[C]\-f\f[], \f[C]\-\-framework\f[] [FID] -.IP -.nf -\f[C] -Publish\ the\ application\ for\ a\ given\ framework\ identifier\ (FID).\ If\ not\ specified,\ FID\ is\ read\ from\ `project.json`.\ In\ case\ of\ no\ valid\ framework\ found,\ the\ command\ will\ error\ out.\ In\ case\ of\ multiple\ valid\ frameworks\ found,\ the\ command\ will\ publish\ for\ all\ valid\ frameworks.\ -\f[] -.fi +.PP +Publishes the application for a given framework identifier (FID). +If not specified, FID is read from \f[C]project.json\f[]. +In no valid framework is found, the command will throw an error. +If multiple valid frameworks are found, the command will publish for all +valid frameworks. .PP \f[C]\-r\f[], \f[C]\-\-runtime\f[] [RID] -.IP -.nf -\f[C] -Publish\ the\ application\ for\ a\ given\ runtime.\ If\ the\ option\ is\ not\ specified,\ the\ command\ will\ default\ to\ the\ runtime\ for\ the\ current\ operationg\ system.\ Supported\ values\ for\ the\ option\ at\ this\ time\ are: - -\ \ \ \ *\ ubuntu.14.04\-x64 -\ \ \ \ *\ ubuntu.16.04\-x64 -\ \ \ \ *\ win7\-x64 -\ \ \ \ *\ win7\-x86 -\ \ \ \ *\ osx.10.10\-x64 -\ \ \ \ *\ osx.10.11\-x64 -\ \ \ \ *\ centos.7\-x64 -\ \ \ \ *\ rhel.7.2\-x64 -\ \ \ \ *\ debian.8\-x64 -\ \ \ \ *\ fedora.23\-x64 -\ \ \ \ *\ opensuse.13.2\-x64 -\f[] -.fi +.PP +Publishes the application for a given runtime. +.PP +\f[C]\-b\f[], \f[C]\-\-build\-base\-path\f[] [DIR] +.PP +Directory in which to place temporary outputs. .PP \f[C]\-o\f[], \f[C]\-\-output\f[] -.IP -.nf -\f[C] -Specify\ the\ path\ where\ to\ place\ the\ directory.\ If\ not\ specified,\ will\ default\ to\ _./bin/[configuration]/[framework]/[runtime]/_ -\f[] -.fi +.PP +Specify the path where to place the directory. +If not specified, it will default to +\f[I]\&./bin/[configuration]/[framework]/\f[] for portable applications +or \f[I]\&./bin/[configuration]/[framework]/[runtime]\f[] for +self\-contained applications. +.PP +\-\-version\-suffix [VERSION_SUFFIX] +.PP +Defines what \f[C]*\f[] should be replaced with in the version field in +the project.json file. .PP \f[C]\-c\f[], \f[C]\-\-configuration\ [Debug|Release]\f[] -.IP -.nf -\f[C] -Configuration\ to\ use\ when\ publishing.\ If\ not\ specified,\ will\ default\ to\ "Debug". -\f[] -.fi -.SH EXAMPLES .PP -\f[C]dotnet\-publish\f[] -.IP -.nf -\f[C] -Publish\ the\ current\ application\ using\ the\ `project.json`\ framework\ and\ runtime\ for\ the\ current\ operating\ system.\ -\f[] -.fi +Configuration to use when publishing. +The default value is Debug. +.SS EXAMPLES .PP -\f[C]dotnet\-publish\ ~/projects/app1/project.json\f[] -.IP -.nf -\f[C] -Publish\ the\ application\ using\ the\ specified\ `project.json`;\ also\ use\ framework\ specified\ withing\ and\ runtime\ for\ the\ current\ operating\ system.\ -\f[] -.fi +\f[C]dotnet\ publish\f[] .PP -\f[C]dotnet\-publish\ \-\-framework\ dnxcore50\f[] -.IP -.nf -\f[C] -Publish\ the\ current\ application\ using\ the\ `dnxcore50`\ framework\ and\ runtime\ for\ the\ current\ operating\ system.\ -\f[] -.fi +Publishes an application using the framework found in +\f[C]project.json\f[]. +If \f[C]project.json\f[] contains \f[C]runtimes\f[] node, publish for +the RID of the current platform. .PP -\f[C]dotnet\-publish\ \-\-framework\ dnxcore50\ \-\-runtime\ osx.10.10\-x64\f[] -.IP -.nf -\f[C] -Publish\ the\ current\ application\ using\ the\ `dnxcore50`\ framework\ and\ runtime\ for\ `OS\ X\ 10.10` -\f[] -.fi -.SH SEE ALSO +\f[C]dotnet\ publish\ ~/projects/app1/project.json\f[] .PP -dotnet\-restore(1), dotnet\-compile(1) +Publishes the application using the specified \f[C]project.json\f[]. +.PP +\f[C]dotnet\ publish\ \-\-framework\ netcoreapp1.0\f[] +.PP +Publishes the current application using the \f[C]netcoreapp1.0\f[] +framework. +.PP +\f[C]dotnet\ publish\ \-\-framework\ netcoreapp1.0\ \-\-runtime\ osx.10.11\-x64\f[] +.PP +Publishes the current application using the \f[C]netcoreapp1.0\f[] +framework and runtime for \f[C]OS\ X\ 10.10\f[]. +This RID has to exist in the \f[C]project.json\f[] \f[C]runtimes\f[] +node. .SH AUTHORS -Zlatko Knezevic zlakne\@microsoft.com. +Microsoft Corporation dotnetclifeedback\@microsoft.com. diff --git a/Documentation/manpages/sdk/dotnet-restore.1 b/Documentation/manpages/sdk/dotnet-restore.1 new file mode 100644 index 000000000..0befbf747 --- /dev/null +++ b/Documentation/manpages/sdk/dotnet-restore.1 @@ -0,0 +1,97 @@ +.\" Automatically generated by Pandoc 1.15.1 +.\" +.hy +.TH "DOTNET\-RESTORE" "1" "June 2016" "" "" +.SS NAME +.PP +\f[C]dotnet\-restore\f[] \- Restores the dependencies and tools of a +project +.SS SYNOPSIS +.PP +\f[C]dotnet\ restore\ [\-\-source]\ \ \ \ \ \ \ [\-\-packages]\ [\-\-disable\-parallel]\ \ \ \ \ \ \ [\-\-fallbacksource]\ [\-\-configfile]\ [\-\-verbosity]\ \ \ \ \ []\f[] +.SS DESCRIPTION +.PP +The \f[C]dotnet\ restore\f[] command uses NuGet to restore dependencies +as well as project\-specific tools that are specified in the +project.json file. +By default, the restoration of dependencies and tools are done in +parallel. +.PP +In order to restore the dependencies, NuGet needs the feeds where the +packages are located. +Feeds are usually provided via the NuGet.config configuration file; a +default one is present when the CLI tools are installed. +You can specify more feeds by creating your own NuGet.config file in the +project directory. +Feeds can also be specified per invocation on the command line. +.PP +For dependencies, you can specify where the restored packages are placed +during the restore operation using the \f[C]\-\-packages\f[] argument. +If not specified, the default NuGet package cache is used. +It is found in the \f[C]\&.nuget/packages\f[] directory in the +user\[aq]s home directory on all operating systems (for example, +\f[C]/home/user1\f[] on Linux or \f[C]C:\\Users\\user1\f[] on Windows). +.PP +For project\-specific tooling, \f[C]dotnet\ restore\f[] first restores +the package in which the tool is packed, and then proceeds to restore +the tool\[aq]s dependencies as specified in its project.json. +.SS OPTIONS +.PP +\f[C][root]\f[] +.PP +A list of projects or project folders to restore. +The list can contain either a path to a \f[C]project.json\f[] file, or a +path to \f[C]global.json\f[] file or folder. +The restore operation runs recursively for all subdirectories and +restores for each given project.json file it finds. +.PP +\f[C]\-s\f[], \f[C]\-\-source\f[] [SOURCE] +.PP +Specifies a source to use during the restore operation. +This overrides all of the sources specified in the NuGet.config file(s). +.PP +\f[C]\-\-packages\f[] [DIR] +.PP +Specifies the directory to place the restored packages in. +.PP +\f[C]\-\-disable\-parallel\f[] +.PP +Disables restoring multiple projects in parallel. +.PP +\f[C]\-f\f[], \f[C]\-\-fallbacksource\f[] [FEED] +.PP +Specifies a fallback source that will be used in the restore operation +if all other sources fail. +All valid feed formats are allowed. +.PP +\f[C]\-\-configfile\f[] [FILE] +.PP +Configuration file (NuGet.config) to use for the restore operation. +.PP +\f[C]\-\-verbosity\f[] [LEVEL] +.PP +The verbosity of logging to use. +Allowed values: Debug, Verbose, Information, Minimal, Warning, or Error. +.SS EXAMPLES +.PP +\f[C]dotnet\ restore\f[] +.PP +Restores dependencies and tools for the project in the current +directory. +.PP +\f[C]dotnet\ restore\ ~/projects/app1/project.json\f[] +.PP +Restores dependencies and tools for the \f[C]app1\f[] project found in +the given path. +.PP +\f[C]dotnet\ restore\ \-\-f\ c:\\packages\\mypackages\f[] +.PP +Restores the dependencies and tools for the project in the current +directory using the file path provided as the fallback source. +.PP +\f[C]dotnet\ restore\ \-\-verbosity\ Error\f[] +.PP +Restores dependencies and tools for the project in the current directory +and shows only errors in the output. +.SH AUTHORS +Microsoft Corporation dotnetclifeedback\@microsoft.com. diff --git a/Documentation/manpages/sdk/dotnet-run.1 b/Documentation/manpages/sdk/dotnet-run.1 index 9b15ca5a5..3dd7d1feb 100644 --- a/Documentation/manpages/sdk/dotnet-run.1 +++ b/Documentation/manpages/sdk/dotnet-run.1 @@ -1,46 +1,88 @@ .\" Automatically generated by Pandoc 1.15.1 .\" .hy -.TH "dotnet-run" "1" "January 2016" "" "" -.SH NAME +.TH "DOTNET\-RUN" "1" "June 2016" "" "" +.SS NAME .PP dotnet\-run \-\- Runs source code \[aq]in\-place\[aq] without any explicit compile or launch commands. -.SH SYNOPSIS +.SS SYNOPSIS .PP -\f[C]dotnet\ run\ [\-\-verbose]\f[] -.SH DESCRIPTION +\f[C]dotnet\ run\ [\-\-framework]\ [\-\-configuration]\ \ \ \ \ [\-\-project]\ [\-\-help]\ [\-\-]\f[] +.SS DESCRIPTION .PP -The run command provides a convenient option to run source code with one -command. +The \f[C]dotnet\ run\f[] command provides a convenient option to run +your application from the source code with one command. It compiles source code, generates an output program and then runs that program. This command is useful for fast iterative development and can also be -used to run a source\-distributed program (e.g. -website). +used to run a source\-distributed program (for example, a website). .PP -This command relies on \f[C]dotnet\-compile(1)\f[] to compile source -inputs to a .NET assembly, before launching the program. -The requirements for and handling of source inputs for this command are -all inherited from the compile command. -The documentation for the compile command provides more information on +This command relies on \f[C]dotnet\ build\f[] (dotnet-build.md) to build +source inputs to a .NET assembly, before launching the program. +The requirements for this command and the handling of source inputs are +all inherited from the build command. +The documentation for the build command provides more information on those requirements. .PP -Output files, are written to the child \f[C]bin\f[] folder, which will -be created if it doesn\[aq]t exist. +Output files are written to the child \f[C]bin\f[] folder, which will be +created if it doesn\[aq]t exist. Files will be overwritten as needed. Temporary files are written to the child \f[C]obj\f[] folder. -.SH OPTIONS .PP -\-v, \-\-verbose -.IP -.nf -\f[C] -Prints\ verbose\ logging\ information,\ to\ follow\ the\ flow\ of\ execution\ of\ the\ command. -\f[] -.fi -.SH SEE ALSO +In case of a project with multiple specified frameworks, +\f[C]dotnet\ run\f[] will first select the .NET Core frameworks. +If those do not exist, it will error out. +To specify other frameworks, use the \f[C]\-\-framework\f[] argument. .PP -dotnet\-compile(1), dotnet\-publish(1) +The \f[C]dotnet\ run\f[] command must be used in the context of +projects, not built assemblies. +If you\[aq]re trying to execute a DLL instead, you should use +\f[C]dotnet\f[] (dotnet.md) without any command like in the following +example: +.PP +\f[C]dotnet\ myapp.dll\f[] +.PP +For more information about the \f[C]dotnet\f[] driver, see the \&.NET +Core Command Line Tools (CLI) (overview.md) topic. +.SS OPTIONS +.PP +\f[C]\-\-\f[] +.PP +Delimits arguments to \f[C]dotnet\ run\f[] from arguments for the +application being run. +All arguments after this one will be passed to the application being +run. +.PP +\f[C]\-f\f[], \f[C]\-\-framework\f[] [FID] +.PP +Runs the application for a given framework identifier (FID). +.PP +\f[C]\-c\f[], \f[C]\-\-configuration\ [Debug|Release]\f[] +.PP +Configuration to use when publishing. +The default value is "Debug". +.PP +\f[C]\-p\f[], \f[C]\-\-project\ [PATH]\f[] +.PP +Specifies which project to run. +It can be a path to a project.json file or to a directory containing a +project.json file. +It defaults to current directory if not specified. +.SS EXAMPLES +.PP +\f[C]dotnet\ run\f[] +.PP +Runs the project in the current directory. +.PP +\f[C]dotnet\ run\ \-\-project\ /projects/proj1/project.json\f[] +.PP +Runs the project specified. +.PP +\f[C]dotnet\ run\ \-\-configuration\ Release\ \-\-\ \-\-help\f[] +.PP +Runs the project in the current directory. +The \f[C]\-\-help\f[] argument above is passed to the application being +run, since the \f[C]\-\-\f[] argument was used. .SH AUTHORS -Zlatko Knezevic zlakne\@microsoft.com. +Microsoft Corporation dotnetclifeedback\@microsoft.com. diff --git a/Documentation/manpages/sdk/dotnet-test.1 b/Documentation/manpages/sdk/dotnet-test.1 new file mode 100644 index 000000000..84a2cf23f --- /dev/null +++ b/Documentation/manpages/sdk/dotnet-test.1 @@ -0,0 +1,170 @@ +.\" Automatically generated by Pandoc 1.15.1 +.\" +.hy +.TH "DOTNET\-TEST" "1" "April 2016" "" "" +.SH Dotnet Test, Adapters and Test Runners +.PP +This document covers the interactions between dotnet test, a potential +adapter (like VS) and test runners (like +xunit (https://github.com/dotnet/coreclr.xunit)). +.PP +It describes the communication protocol for these agents, the parameters +that the runner needs to support and the modes on which dotnet test and +the runner work. +.SS Running modes +.PP +Dotnet test supports two running modes: +.IP "1." 3 +Console: In console mode, dotnet test simply executes fully whatever +command gets passed to it and outputs the results. +Anytime you invoke dotnet test without passing \-\-port, it will run in +console mode, which in turn will cause the runner to run in console +mode. +.IP "2." 3 +Design time: Anytime you pass a port to dotnet test, we will run in +design time. +That means that dotnet test will connect to that port using TCP and will +then exchange a established set of messages with whatever else is +connected to that port. +When this happens, the runner also receives a port (a new one, mind you) +that dotnet test will use to communicate with it. +The reason why the runner also uses TCP to communicate with dotnet test +is because in design mode, it is not sufficient to just output results +to the console. +We need to send the adapter structure messages containing the results of +the test execution. +.SS Communication protocol in design time. +.IP "1." 3 +Because during design time, dotnet test connects to a port when it +starts up, the adapter needs to be listening on that port otherwise +dotnet test will fail. +We did it like this so that the adapter could reserve all the ports it +needs by binding and listening to them before dotnet test ran and tried +to get ports for the runner. +.IP "2." 3 +Once dotnet test starts, it sends a TestSession.Connected message to the +adapter indicating that it is ready to receive messages. +.IP "3." 3 +It is possible to send an optional version +check (https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Messages/ProtocolVersionMessage.cs) +message with the adapter version of the protocol in it. +Dotnet test will send back the version of the protocol that it supports. +.PP +All messages have the format described here: +Message.cs (https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Messages/Message.cs). +The payload formats for each message is described in links to the +classes used to de/serialize the information in the description of the +protocol. +.SS Test Execution +.PP +[IMAGE: alt +tag (../../../../Documentation/images/DotnetTestExecuteTests.png)] +.IP "1." 3 +After the optional version check, the adapter sends a +TestExecution.GetTestRunnerProcessStartInfo, with the +tests (https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Messages/RunTestsMessage.cs) +it wants to execute inside of it. +Dotnet test sends back a FileName and Arguments inside a +TestStartInfo (https://github.com/dotnet/cli/blob/rel/1.0.0/src/dotnet/commands/dotnet-test/TestStartInfo.cs) +payload that the adapter can use to start the runner. +In the past, we would send the list of tests to run as part of that +argument, but we were actually going over the command line size limit +for some test projects. +.IP "2." 3 +As part of the arguments, we send a port that the runner should connect +to and for executing tests, a \-\-wait\-command flag, that indicates +that the runner should connect to the port and wait for commands, +instead of going ahead and executing the tests. +.IP "3." 3 +At this point, the adapter can launch the runner (and attach to it for +debugging if it chooses to). +.IP "4." 3 +Once the runner starts, it sends dotnet test a TestRunner.WaitCommand +message that indicates it is ready to receive commands, at which point +dotnet test sends a TestRunner.Execute with the list of +tests (https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Messages/RunTestsMessage.cs) +to run. +This bypasses the command line size limit described above. +.IP "5." 3 +The runner then sends dotnet test (and it passes forward to the adapter) +a TestExecution.TestStarted for each tests as they start with the +test (https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Test.cs) +information inside of it. +.IP "6." 3 +The runner also sends dotnet test (and it forwards to the adapter) a +TestExecution.TestResult for each test with the individual +result (https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/TestResult.cs) +of the test. +.IP "7." 3 +After all tests finish, the runner sends a TestRunner.Completed message +to dotnet test, which dotnet test sends as TestExecution.Completed to +the adapter. +.IP "8." 3 +Once the adapter is done, it sends dotnet test a TestSession.Terminate +which will cause dotnet test to shutdown. +.SS Test discovery +.PP +[IMAGE: alt +tag (../../../..//Documentation/images/DotnetTestDiscoverTests.png)] +.IP "1." 3 +After the optional version check, the adapter sends a +TestDiscovery.Start message. +Because in this case, the adapter does not need to attach to the +process, dotnet test will start the runner itself. +Also, since there is no long list of arguments to be passed to the +runner, no \-\-wait\-command flag is needed to be passed to the runner. +dotnet test only passes a \-\-list argument to the runner, which means +the runner should not run the tests, just list them. +.IP "2." 3 +The runner then sends dotnet test (and it passes forward to the adapter) +a TestDiscovery.TestFound for each +test (https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Test.cs) +found. +.IP "3." 3 +After all tests are discovered, the runner sends a TestRunner.Completed +message to dotnet test, which dotnet test sends as +TestDiscovery.Completed to the adapter. +.IP "4." 3 +Once the adapter is done, it sends dotnet test a TestSession.Terminate +which will cause dotnet test to shutdown. +.SS Dotnet test parameters +.PP +Any parameters not accepted by dotnet test will be forwarded to the +runner. +This is the list of parameters supported by dotnet test from its own +help print out: +.PP +Usage: dotnet test [arguments] [options] +.PP +Arguments: The project to test, defaults to the current directory. +Can be a path to a project.json or a project directory. +.PP +Options: \-?|\-h|\-\-help Show help information \-\-parentProcessId Used +by IDEs to specify their process ID. +Test will exit if the parent process does. +\-\-port Used by IDEs to specify a port number to listen for a +connection. +\-c|\-\-configuration Configuration under which to build \-o|\-\-output +Directory in which to find the binaries to be run +\-b|\-\-build\-base\-path Directory in which to find temporary outputs +\-f|\-\-framework Looks for test binaries for a specific framework +\-r|\-\-runtime Look for test binaries for a for the specified runtime +\-\-no\-build Do not build project before testing +.SS Minimum parameters that the runner needs to support +.IP \[bu] 2 +AssemblyUnderTest: Path to the dll that contains the tests to be run. +.IP \[bu] 2 +\-\-port: Used by dotnet test to specify a port number that the runner +should connect to. +.IP \[bu] 2 +\-\-list: Indicates that the tests should only be listed and not +executed. +.IP \[bu] 2 +\-\-designtime: Indicates that the runner is running in design time, for +instance, inside an adapter. +.IP \[bu] 2 +\-\-wait\-command: Indicates that the runner should wait to receive +commands through the TCP channel instead of running tests right away. +We use this to get around the command line size limit. +.SH AUTHORS +Microsoft Corporation dotnetclifeedback\@microsoft.com. diff --git a/src/dotnet/README.md b/src/dotnet/README.md index bbfd423f9..d6b5dc6d3 100644 --- a/src/dotnet/README.md +++ b/src/dotnet/README.md @@ -1,93 +1,87 @@ % DOTNET(1) % Microsoft Corporation dotnetclifeedback@microsoft.com -% January 2016 +% June 2016 -# NAME +## NAME -dotnet -- general driver for running the command-line commands +dotnet -- General driver for running the command-line commands -# SYNOPSIS +## SYNOPSIS -dotnet [--version] [--info] [--help] [--verbose] < command > [< args >] +`dotnet [--version] [--help] [--verbose] [--info] []` -# DESCRIPTION -dotnet is a generic driver for the CLI toolchain. Invoked on its own, it will give out brief usage instructions. +## DESCRIPTION +`dotnet` is a generic driver for the Command Line Interface (CLI) toolchain. Invoked on its own, it will give out brief usage instructions. -Each specific feature is implemented as a command. In order to use the feature, it is specified after dotnet, i.e. `dotnet compile`. All of the arguments following the command are command's own arguments. +Each specific feature is implemented as a command. In order to use the feature, the command is specified after `dotnet`, such as [`dotnet build`](dotnet-build.md). All of the arguments following the command are its own arguments. + +The only time `dotnet` is used as a command on its own is to run portable apps. Just specify a portable application DLL after the `dotnet` verb to execute the application. -# OPTIONS +## OPTIONS `-v, --verbose` - Enable verbose output. +Enables verbose output. `--version` - Print out the version of the CLI tooling +Prints out the version of the CLI tooling. `--info` - Print out information about the CLI tooling +Prints out more detailed information about the CLI tooling, such as the current operating system, commit SHA for the version, etc. `-h, --help` - Print out a short help and a list of current commands. +Prints out a short help and a list of current commands. -# DOTNET COMMANDS +## DOTNET COMMANDS -The following commands exist for dotnet. +The following commands exist for dotnet: -`dotnet-compile(1)` +* [dotnet-new](dotnet-new.md) + * Initializes a C# or F# console application project. +* [dotnet-restore](dotnet-restore.md) + * Restores the dependencies for a given application. +* [dotnet-build](dotnet-build.md) + * Builds a .NET Core application. +* [dotnet-publish](dotnet-publish.md) + * Publishes a .NET portable or self-contained application. +* [dotnet-run](dotnet-run.md) + * Runs the application from source. +* [dotnet-test](dotnet-test.md) + * Runs tests using a test runner specified in the project.json. +* [dotnet-pack](dotnet-pack.md) + * Creates a NuGet package of your code. - Compile the application to either an intermediate language (IL) or to a native binary. - -`dotnet-restore(1)` - - Restores the dependencies for a given application. - -`dotnet-run(1)` - - Runs the application from source. - -`dotnet-publish(1)` - - Publishes a flat directory that contains the application and its dependencies, including the runtime binaries. - -`dotnet-test(1)` - - Runs tests using a test runner specified in project.json. - -`dotnet-new(1)` - - Initializes a sample .NET Core console application. - -# EXAMPLES +## EXAMPLES `dotnet new` - Initializes sample applications that can be compiled and run. +Initializes a sample .NET Core console application that can be compiled and run. `dotnet restore` - Restores dependencies for a given application. +Restores dependencies for a given application. `dotnet compile` - Compiles the application in a given directory. +Compiles the application in a given directory. -# ENVIRONMENT +`dotnet myapp.dll` + +Runs a portable app named `myapp.dll`. + +## ENVIRONMENT `DOTNET_PACKAGES` - The primary package cache. If not set, defaults to $HOME/.nuget/packages on Unix or %LOCALAPPDATA%\NuGet\Packages (TBD) on Windows. - -`DOTNET_PACKAGES_CACHE` - - The secondary cache. This is used by shared hosters (such as Azure) to provide a cache of pre-downloaded common packages on a faster disk. If not set it is not used. +The primary package cache. If not set, it defaults to $HOME/.nuget/packages on Unix or %HOME%\NuGet\Packages on Windows. `DOTNET_SERVICING` - Specifies the location of the servicing index to use by the shared host when loading the runtime. +Specifies the location of the servicing index to use by the shared host when loading the runtime. -# SEE ALSO -dotnet-compile(1), dotnet-run(1), dotnet-publish(1), dotnet-restore(1) +`DOTNET_CLI_TELEMETRY_OPTOUT` + +Specifies whether data about the .NET Core tools usage is collected and sent to Microsoft. **true** to opt-out of the telemetry feature (values true, 1 or yes accepted); otherwise, **false** (values false, 0 or no accepted). If not set, it defaults to **false**, that is, the telemetry feature is on. \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-build/README.md b/src/dotnet/commands/dotnet-build/README.md index 2ec58086b..a0817a46d 100644 --- a/src/dotnet/commands/dotnet-build/README.md +++ b/src/dotnet/commands/dotnet-build/README.md @@ -3,37 +3,36 @@ % April 2016 ## NAME -dotnet-build -- builds a project and all of its' dependencies +dotnet-build -- Builds a project and all of its dependencies ## SYNOPSIS -dotnet-build [--output] +`dotnet build [--output] [--build-base-path] [--framework] [--configuration] [--runtime] [--version-suffix] [--build-profile] [--no-incremental] [--no-dependencies] - [< project >] + []` ## DESCRIPTION -`dotnet-build` builds multiple source file from a source project and its dependencies into a binary. -The binary will be in Intermmidiate Language (IL) by default and will have a DLL extension. -`dotnet-build` will also drop a \*.deps file which outlines what the runner needs to run the application. +The `dotnet build` command builds multiple source file from a source project and its dependencies into a binary. +The binary will be in Intermediate Language (IL) by default and will have a DLL extension. +`dotnet build` will also drop a `\*.deps` file which outlines what the host needs to run the application. -Building requires an existence of a lock file which means that a `dotnet-restore` call needs to happen -previous to building. +Building requires the existence of a lock file, which means that you have to run [`dotnet restore`](dotnet-restore.md) prior to building your code. -Before any compilation begins, the build verb analyzes the project and its dependencies for incremental safety checks. -If all checks clear out, then build proceeds with incremental compilation of the project and its dependencies; -otherwise it falls back to non-incremental compilation. Via a profile flag, users can choose to receive additional +Before any compilation begins, the build verb analyzes the project and its dependencies for incremental safety checks. +If all checks pass, then build proceeds with incremental compilation of the project and its dependencies; +otherwise, it falls back to non-incremental compilation. Via a profile flag, users can choose to receive additional information on how they can improve their build times. -All the projects in the dependency graph that need compilation must pass the following safety checks in order for the +All projects in the dependency graph that need compilation must pass the following safety checks in order for the compilation process to be incremental: -- not use pre / post compile scripts -- not load compilation tools from PATH (e.g., resgen, compilers) +- not use pre/post compile scripts +- not load compilation tools from PATH (for example, resgen, compilers) - use only known compilers (csc, vbc, fsc) -In order to build an executable application (console application), you need a special configuration section in project.json: +In order to build an executable application, you need a special configuration section in your project.json file: ```json { @@ -43,8 +42,6 @@ In order to build an executable application (console application), you need a sp } ``` -Class libraries do not need this special piece of configuration. - ## OPTIONS `-o`, `--output` [DIR] @@ -53,18 +50,15 @@ Directory in which to place the built binaries. `-b`, `--build-base-path` [DIR] -Directory in which to place temporary outputs +Directory in which to place temporary outputs. `-f`, `--framework` [FRAMEWORK] -Compile for a specific framework. The framework needs to be defined in the project.json file. +Compiles for a specific framework. The framework needs to be defined in the project.json file. -`-c`, `--configuration` [CONFIGURATION] +`-c`, `--configuration` [Debug|Release] -Configuration under which to build. If omitted defaults to "Debug". Possible configuration options are: - - * Debug - * Release +Defines a configuration under which to build. If omitted, it defaults to Debug. `-r`, `--runtime` [RUNTIME_IDENTIFIER] @@ -72,7 +66,7 @@ Target runtime to build for. --version-suffix [VERSION_SUFFIX] -Defines what `*` should be replaced with in the version field in project.json. +Defines what `*` should be replaced with in the version field in the project.json file. The format follows NuGet's version guidelines. `--build-profile` @@ -84,4 +78,4 @@ Marks the build as unsafe for incremental build. This turns off incremental comp `--no-dependencies` -Ignore project-to-project references and only build the root project specified to build. +Ignores project-to-project references and only builds the root project specified to build. \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-new/README.md b/src/dotnet/commands/dotnet-new/README.md index 368ac7b39..fa1f474b0 100644 --- a/src/dotnet/commands/dotnet-new/README.md +++ b/src/dotnet/commands/dotnet-new/README.md @@ -1,31 +1,28 @@ % DOTNET-NEW(1) % Microsoft Corporation dotnetclifeedback@microsoft.com -% April 2016 +% June 2016 ## NAME dotnet-new -- Create a new sample .NET Core project ## SYNOPSIS -dotnet-new [--type] [--lang] +dotnet new [--type] [--lang] ## DESCRIPTION -The new command provides a convenient way to initalize a valid .NET Core project and sample source code to try out the CLI toolset. +The `dotnet new` command provides a convenient way to initialize a valid .NET Core project and sample source code to try out the Command Line Interface (CLI) toolset. This command is invoked in the context of a directory. When invoked, the command will result in two main artifacts being dropped to the directory: -1. A sample "Hello World" program that exists in `Program.cs` ( or `Program.fs` ) file. -2. A valid `project.json` file - -> **Note:** As a workaround for packages not being on NuGet.org yet (since this is prelease software) the `dotnet-new` -> command will also drop a `NuGet.config` file. This will be removed at RC2 release. +1. A `Program.cs` (or `Program.fs`) file that contains a sample "Hello World" program. +2. A valid `project.json` file. After this, the project is ready to be compiled and/or edited further. ## Options -`-l`, `--lang [C##|F##]` +`-l`, `--lang [C#|F#]` -Language of project. Defaults to `C##`. Also `csharp` ( `fsharp` ) or `cs` ( `fs` ) works. +Language of the project. Defaults to `C#`. `csharp` (`fsharp`) or `cs` (`fs`) are also valid options. `-t`, `--type` diff --git a/src/dotnet/commands/dotnet-pack/README.md b/src/dotnet/commands/dotnet-pack/README.md index 9c8de99fd..9f41b0699 100644 --- a/src/dotnet/commands/dotnet-pack/README.md +++ b/src/dotnet/commands/dotnet-pack/README.md @@ -1,26 +1,24 @@ % DOTNET-PACK(1) % Microsoft Corporation dotnetclifeedback@microsoft.com -% April 2016 +% June 2016 ## NAME -dotnet-pack - packs the code into a NuGet package +`dotnet-pack` - Packs the code into a NuGet package ## SYNOPSIS -dotnet-pack [--output] +`dotnet pack [--output] [--no-build] [--build-base-path] [--configuration] [--version-suffix] - [< project >] + []` ## DESCRIPTION -`dotnet-pack` will build the project and package it up as a NuGet file. The result of this operation are two packages -with the extension of `nupkg`. One package contains the code and another contains the debug symbols. +The `dotnet pack` command builds the project and creates NuGet packages. The result of this operation is two packages with the `nupkg` extension. One package contains the code and the other contains the debug symbols. -NuGet dependencies of the project being packed are added to the nuspec file so they are able to be resolved when the -package is installed. Project-to-project references are not packaged inside the project by default. If you wish to do -this, you need to reference the required project in your dependencies node with a `type` set to "build": +NuGet dependencies of the project being packed are added to the nuspec file, so they are able to be resolved when the package is installed. +Project-to-project references are not packaged inside the project by default. If you wish to do this, you need to reference the required project in your dependencies node with a `type` set to "build" like in the following example: ```json { @@ -34,28 +32,26 @@ this, you need to reference the required project in your dependencies node with } ``` -`dotnet-pack` will by default build the project. If you wish to avoid this pass the `--no-build` option. This would be -useful in CI build scenarios in which you know the code was just previously built. +`dotnet pack` by default first builds the project. If you wish to avoid this, pass the `--no-build` option. This can be useful in Continuous Integration (CI) build scenarios in which you know the code was just previously built, for example. ## OPTIONS `[project]` -The project to pack. It can be either a path to a `project.json` file or a path to a directory. If omitted, will +The project to pack. It can be either a path to a `project.json` file or to a directory. If omitted, it will default to the current directory. `-o`, `--output` [DIR] -Place the built packages in the directory specified. - +Places the built packages in the directory specified. `--no-build` -Skip the building phase of the packing process. +Skips the building phase of the packing process. `--build-base-path` -Place the temporary build artifacts in the specified directory. By default, they go to obj directory in the current directory. +Places the temporary build artifacts in the specified directory. By default, they go to the obj directory in the current directory. `-c`, `--configuration [Debug|Release]` @@ -63,30 +59,18 @@ Configuration to use when building the project. If not specified, will default t ## EXAMPLES -### Pack the current project -`dotnet-pack` +`dotnet pack` -### Pack the specific project -`dotnet-pack ~/projects/app1/project.json` +Packs the current project. -### Pack the current application and place the resulting packages into the specified folder -`dotnet-pack --output nupkgs` +`dotnet pack ~/projects/app1/project.json` + +Packs the app1 project. + +`dotnet pack --output nupkgs` + +Packs the current application and place the resulting packages into the specified folder. -### Pack the current project into the specified folder and skip the build step -`dotnet-pack --no-build --output nupkgs` - -### Add files to a project -Add following section in the project.json -```json -{ - "packInclude": { - "dir/in/the/package/": "path_relative_to_project.json", - "other/dir/in/the/package/": "absolute_path_to_a.file", - "another/dir/in/the/package/": ["file1.txt", "file2.txt", "file3.txt"], - "runtimes/ubuntu.14.04-x64/native/": "rid_specific_native_file.so" - } -} -``` - -## SEE ALSO +`dotnet pack --no-build --output nupkgs` +Packs the current project into the specified folder and skips the build step. \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-publish/README.md b/src/dotnet/commands/dotnet-publish/README.md index f4d57a6c1..f34da3dcf 100644 --- a/src/dotnet/commands/dotnet-publish/README.md +++ b/src/dotnet/commands/dotnet-publish/README.md @@ -1,86 +1,79 @@ % DOTNET-PUBLISH(1) % Microsoft Corporation dotnetclifeedback@microsoft.com -% April 2016 - +% June 2016 ## NAME -`dotnet-publish` - packs the application and all of its dependencies into a folder getting it ready for publishing +`dotnet-publish` - Packs the application and all of its dependencies into a folder getting it ready for publishing ## SYNOPSIS -dotnet-publish [--framework] +`dotnet publish [--framework] [--runtime] [--build-base-path] [--output] [--version-suffix] [--configuration] - [< project >] + []` ## DESCRIPTION -`dotnet-publish` builds the application, reads through its dependencies specified in `project.json` and publishes the resulting set of files to a directory. +`dotnet publish` compiles the application, reads through its dependencies specified in the `project.json` file and publishes the resulting set of files to a directory. -Depending on the type of portable app, the directory contains the following: +Depending on the type of portable app, the resulting directory will contain the following: 1. **Portable application** - application's intermediate language (IL) code and all of application's managed dependencies. - * **Portable application with native dependencies** - as above with a sub-directory for each native dependencies' - supported platform. -2. **Self-contained application** - as above as well as the entire runtime for the targeted platform. + * **Portable application with native dependencies** - same as above with a sub-directory for the supported platform of each native + dependency. +2. **Self-contained application** - same as above plus the entire runtime for the targeted platform. -The above types are covered in more details in the [types of portable applications](app-types.md) document. +The above types are covered in more details in the [types of portable applications](../../app-types.md) topic. ## OPTIONS `[project]` -`dotnet-publish` needs access to `project.json` to work. If it is not specified on invocation via [project], -`project.json` in the current directory will be the default. -If no `project.json` can be found, `dotnet-publish` will error out. +`dotnet publish` needs access to the `project.json` file to work. If it is not specified on invocation via [project], `project.json` in the current directory will be the default. +If no `project.json` can be found, `dotnet publish` will throw an error. `-f`, `--framework` [FID] -Publish the application for a given framework identifier (FID). If not specified, FID is read from `project.json`. In case of no valid framework found, the command will error out. In case of multiple valid frameworks found, the command will publish for all valid frameworks. +Publishes the application for a given framework identifier (FID). If not specified, FID is read from `project.json`. In no valid framework is found, the command will throw an error. If multiple valid frameworks are found, the command will publish for all valid frameworks. `-r`, `--runtime` [RID] -Publish the application for a given runtime. +Publishes the application for a given runtime. `-b`, `--build-base-path` [DIR] -Directory in which to place temporary outputs +Directory in which to place temporary outputs. `-o`, `--output` -Specify the path where to place the directory. If not specified, will default to _./bin/[configuration]/[framework]/_ -for portable applications. For self-contained applications, will default to _./bin/[configuration]/[framework]/[runtime]_ +Specify the path where to place the directory. If not specified, it will default to _./bin/[configuration]/[framework]/_ +for portable applications or _./bin/[configuration]/[framework]/[runtime]_ for self-contained applications. --version-suffix [VERSION_SUFFIX] -Defines what `*` should be replaced with in the version field in project.json. +Defines what `*` should be replaced with in the version field in the project.json file. `-c`, `--configuration [Debug|Release]` -Configuration to use when publishing. If not specified, will default to "Debug". +Configuration to use when publishing. The default value is Debug. ## EXAMPLES `dotnet publish` -Publish an application using the framework found in `project.json`. If `project.json` contains `runtimes` node, publish -for the RID of the current platform. +Publishes an application using the framework found in `project.json`. If `project.json` contains `runtimes` node, publish for the RID of the current platform. `dotnet publish ~/projects/app1/project.json` -Publish the application using the specified `project.json`. +Publishes the application using the specified `project.json`. `dotnet publish --framework netcoreapp1.0` -Publish the current application using the `netcoreapp1.0` framework. +Publishes the current application using the `netcoreapp1.0` framework. `dotnet publish --framework netcoreapp1.0 --runtime osx.10.11-x64` -Publish the current application using the `netcoreapp1.0` framework and runtime for `OS X 10.10`. This RID has to -exist in the `project.json` `runtimes` node. - -## SEE ALSO - -dotnet-restore(1), dotnet-build(1) +Publishes the current application using the `netcoreapp1.0` framework and runtime for `OS X 10.10`. This RID has to +exist in the `project.json` `runtimes` node. \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-restore/README.md b/src/dotnet/commands/dotnet-restore/README.md index d2beaebb9..629697ae7 100644 --- a/src/dotnet/commands/dotnet-restore/README.md +++ b/src/dotnet/commands/dotnet-restore/README.md @@ -1,44 +1,45 @@ % DOTNET-RESTORE(1) % Microsoft Corporation dotnetclifeedback@microsoft.com -% April 2016 +% June 2016 ## NAME -dotnet-restore - restores the dependencies and tools of a project +`dotnet-restore` - Restores the dependencies and tools of a project ## SYNOPSIS -dotnet-restore [--source] +`dotnet restore [--source] [--packages] [--disable-parallel] [--fallbacksource] [--configfile] [--verbosity] - [< root >] + []` ## DESCRIPTION -`dotnet-restore` will use NuGet to restore dependencies as well as project-specific tools that are specified in the -project.json file. By default, the restoration of dependencies and tools will be done in parallel. +The `dotnet restore` command uses NuGet to restore dependencies as well as project-specific tools that are specified in the project.json file. +By default, the restoration of dependencies and tools are done in parallel. -In order to restore the dependencies, NuGet needs feeds where the packages are located. Feeds are usually provided via the -NuGet.config configuration file; a default one is present when CLI tools are installed. You can specify more feeds by -creating your own NuGet.config file in the project directory. Feeds can also be specified per invocation on the command line. +In order to restore the dependencies, NuGet needs the feeds where the packages are located. +Feeds are usually provided via the NuGet.config configuration file; a default one is present when the CLI tools are installed. +You can specify more feeds by creating your own NuGet.config file in the project directory. +Feeds can also be specified per invocation on the command line. -For dependencies, you can specify where the restored packages will be placed during the restore operation using the -`--packages` argument. If not specified, the default NuGet package cache will be used. It is found in the `.nuget/packages` -directory in the user's home directory on all operating systems (for example `/home/user1` on Linux or `C:\Users\user1` -on Windows). +For dependencies, you can specify where the restored packages are placed during the restore operation using the +`--packages` argument. +If not specified, the default NuGet package cache is used. +It is found in the `.nuget/packages` directory in the user's home directory on all operating systems (for example, `/home/user1` on Linux or `C:\Users\user1` on Windows). -For project-specific tooling, `dotnet-restore` will first restore the package in which the tool is packed, and will then -proceed to restore the tool's dependencies as specified in its project.json. +For project-specific tooling, `dotnet restore` first restores the package in which the tool is packed, and then +proceeds to restore the tool's dependencies as specified in its project.json. ## OPTIONS `[root]` - A list of projects or project folders to restore. The list can contain either a path to a `project.json` file, path to `global.json` file or folder. The restore operation will run recursivelly for all subdirectories and restore for each given project.json file it finds. + A list of projects or project folders to restore. The list can contain either a path to a `project.json` file, or a path to `global.json` file or folder. The restore operation runs recursively for all subdirectories and restores for each given project.json file it finds. `-s`, `--source` [SOURCE] -Specify a source to use during the restore operation. This will override all of the sources specified in the NuGet.config file(s). +Specifies a source to use during the restore operation. This overrides all of the sources specified in the NuGet.config file(s). `--packages` [DIR] @@ -46,38 +47,34 @@ Specifies the directory to place the restored packages in. `--disable-parallel` -Disable restoring multiple projects in parallel. +Disables restoring multiple projects in parallel. `-f`, `--fallbacksource` [FEED] -Specify a fallback source that will be used in the restore operation if all other sources fail. All valid feed formats are allowed. +Specifies a fallback source that will be used in the restore operation if all other sources fail. All valid feed formats are allowed. `--configfile` [FILE] -Configuration file (NuGet.config) to use for this restore operation. +Configuration file (NuGet.config) to use for the restore operation. `--verbosity` [LEVEL] -The verbosity of logging to use. Allowed values: Debug, Verbose, Information, Minimal, Warning, Error. +The verbosity of logging to use. Allowed values: Debug, Verbose, Information, Minimal, Warning, or Error. ## EXAMPLES -`dotnet-restore` +`dotnet restore` -Restore dependencies and tools for the project in the current directory. +Restores dependencies and tools for the project in the current directory. -`dotnet-restore ~/projects/app1/project.json` +`dotnet restore ~/projects/app1/project.json` -Restore dependencies and tools for the app1 project found in the given path. +Restores dependencies and tools for the `app1` project found in the given path. -`dotnet-restore --f c:\packages\mypackages` +`dotnet restore --f c:\packages\mypackages` -Restore the dependencies and tools for the project in the current directory using the file path provided as the fallback source. +Restores the dependencies and tools for the project in the current directory using the file path provided as the fallback source. -`dotnet-restore --verbosity Error` +`dotnet restore --verbosity Error` -Show only errors in the output. - -## SEE ALSO - -dotnet \ No newline at end of file +Restores dependencies and tools for the project in the current directory and shows only errors in the output. diff --git a/src/dotnet/commands/dotnet-run/README.md b/src/dotnet/commands/dotnet-run/README.md index bff786e89..1c75e50d7 100644 --- a/src/dotnet/commands/dotnet-run/README.md +++ b/src/dotnet/commands/dotnet-run/README.md @@ -1,6 +1,6 @@ % DOTNET-RUN(1) % Microsoft Corporation dotnetclifeedback@microsoft.com -% April 2016 +% June 2016 ## NAME @@ -8,45 +8,62 @@ dotnet-run -- Runs source code 'in-place' without any explicit compile or launch ## SYNOPSIS -dotnet-run [--framework] [--configuration] - [--project] [--] [--help] +`dotnet run [--framework] [--configuration] + [--project] [--help] [--]` ## DESCRIPTION -The run command provides a convenient option to run source code with one command. It compiles source code, generates an -output program and then runs that program. This command is useful for fast iterative development and can also be used -to run a source-distributed program (e.g. website). +The `dotnet run` command provides a convenient option to run your application from the source code with one command. +It compiles source code, generates an output program and then runs that program. +This command is useful for fast iterative development and can also be used to run a source-distributed program (for example, a website). -This command relies on `dotnet-build(1)` to build source inputs to a .NET assembly, before launching the program. -The requirements for and handling of source inputs for this command are all inherited from the build command. +This command relies on [`dotnet build`](dotnet-build.md) to build source inputs to a .NET assembly, before launching the program. +The requirements for this command and the handling of source inputs are all inherited from the build command. The documentation for the build command provides more information on those requirements. Output files are written to the child `bin` folder, which will be created if it doesn't exist. -Files will be overwritten as needed. Temporary files are written to the child `obj` folder. +Files will be overwritten as needed. +Temporary files are written to the child `obj` folder. + +In case of a project with multiple specified frameworks, `dotnet run` will first select the .NET Core frameworks. If those do not exist, it will error out. To specify other frameworks, use the `--framework` argument. + +The `dotnet run` command must be used in the context of projects, not built assemblies. If you're trying to execute a DLL instead, you should use [`dotnet`](dotnet.md) without any command like in the following example: + +`dotnet myapp.dll` + +For more information about the `dotnet` driver, see the [.NET Core Command Line Tools (CLI)](overview.md) topic. -In case of a project with multiple specified frameworks, `dotnet run` will first select the .NET Core frameworks. If -those do not exist, it will error out. To specify other frameworks, use the `--framework` argument. ## OPTIONS `--` -Delimit arguments to `dotnet run` from arguments for the application being run. All arguments after this one will be passed to -the application being run. +Delimits arguments to `dotnet run` from arguments for the application being run. +All arguments after this one will be passed to the application being run. `-f`, `--framework` [FID] -Run the application for a given framework identifier (FID). +Runs the application for a given framework identifier (FID). `-c`, `--configuration [Debug|Release]` -Configuration to use when publishing. If not specified, will default to "Debug". +Configuration to use when publishing. The default value is "Debug". `-p`, `--project [PATH]` -Specifies which project to run. Can be a path to project.json or to a directory containing a project.json. Defaults to +Specifies which project to run. +It can be a path to a project.json file or to a directory containing a project.json file. It defaults to current directory if not specified. +## EXAMPLES -# SEE ALSO +`dotnet run` -dotnet-build(1), dotnet-publish(1) +Runs the project in the current directory. + +`dotnet run --project /projects/proj1/project.json` + +Runs the project specified. + +`dotnet run --configuration Release -- --help` + +Runs the project in the current directory. The `--help` argument above is passed to the application being run, since the `--` argument was used. \ No newline at end of file diff --git a/src/dotnet/commands/dotnet-test/readme.md b/src/dotnet/commands/dotnet-test/readme.md index 5fdea02ca..ab1d7cc27 100644 --- a/src/dotnet/commands/dotnet-test/readme.md +++ b/src/dotnet/commands/dotnet-test/readme.md @@ -2,80 +2,103 @@ % Microsoft Corporation dotnetclifeedback@microsoft.com % April 2016 -Dotnet Test, Adapters and Test Runners -====================================== +## NAME -This document covers the interactions between dotnet test, a potential adapter (like VS) and -test runners (like [xunit](https://github.com/dotnet/coreclr.xunit)). +`dotnet-test` - Runs unit tests using the configured test runner -It describes the communication protocol for these agents, the parameters that the runner needs to support and the -modes on which dotnet test and the runner work. +## SYNOPSIS -## Running modes +`dotnet test [--configuration] + [--output] [--build-base-path] [--framework] [--runtime] + [--no-build] + [--parentProcessId] [--port] + []` -Dotnet test supports two running modes: +## DESCRIPTION -1. Console: In console mode, dotnet test simply executes fully whatever command gets passed to it and outputs the results. Anytime you -invoke dotnet test without passing --port, it will run in console mode, which in turn will cause the runner to run in console mode. -2. Design time: Anytime you pass a port to dotnet test, we will run in design time. That means that dotnet test will connect to that port -using TCP and will then exchange a established set of messages with whatever else is connected to that port. When this happens, the runner -also receives a port (a new one, mind you) that dotnet test will use to communicate with it. The reason why the runner also uses TCP to -communicate with dotnet test is because in design mode, it is not sufficient to just output results to the console. We need to send the -adapter structure messages containing the results of the test execution. +The `dotnet test` command is used to execute unit tests in a given project. Unit tests are class library +projects that have dependencies on the unit test framework (for example, NUnit or xUnit) and the +dotnet test runner for that unit testing framework. +These are packaged as NuGet packages and are restored as ordinary dependencies for the project. -### Communication protocol in design time. +Test projects also need to specify a test runner property in project.json using the "testRunner" node. +This value should contain the name of the unit test framework. -1. Because during design time, dotnet test connects to a port when it starts up, the adapter needs to be listening on that port otherwise dotnet test will fail. We did it like this so that the adapter could reserve all the ports it needs by binding and listening to them before dotnet test ran and tried to get ports for the runner. -2. Once dotnet test starts, it sends a TestSession.Connected message to the adapter indicating that it is ready to receive messages. -3. It is possible to send an optional [version check](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Messages/ProtocolVersionMessage.cs) message with the adapter version of the protocol in it. Dotnet test will send back the version of the protocol that it supports. +The following sample project.json shows the properties needed: -All messages have the format described here: [Message.cs](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Messages/Message.cs). The payload formats for each message is described in links to the classes used to de/serialize the information in the description of the protocol. +```json +{ + "version": "1.0.0-*", -#### Test Execution -![alt tag](../../../../Documentation/images/DotnetTestExecuteTests.png) + "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-rc2-3002702", + "type": "platform" + }, + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-rc2-build10015" + }, + "testRunner": "xunit", -1. After the optional version check, the adapter sends a TestExecution.GetTestRunnerProcessStartInfo, with the [tests](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Messages/RunTestsMessage.cs) it wants to execute inside of it. Dotnet test sends back a FileName and Arguments inside a [TestStartInfo](https://github.com/dotnet/cli/blob/rel/1.0.0/src/dotnet/commands/dotnet-test/TestStartInfo.cs) payload that the adapter can use to start the runner. In the past, we would send the list of tests to run as part of that argument, but we were actually going over the command line size limit for some test projects. - 1. As part of the arguments, we send a port that the runner should connect to and for executing tests, a --wait-command flag, that indicates that the runner should connect to the port and wait for commands, instead of going ahead and executing the tests. -2. At this point, the adapter can launch the runner (and attach to it for debugging if it chooses to). -3. Once the runner starts, it sends dotnet test a TestRunner.WaitCommand message that indicates it is ready to receive commands, at which point dotnet test sends a TestRunner.Execute with the list of [tests](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Messages/RunTestsMessage.cs) to run. This bypasses the command line size limit described above. -4. The runner then sends dotnet test (and it passes forward to the adapter) a TestExecution.TestStarted for each tests as they start with the [test](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Test.cs) information inside of it. -5. The runner also sends dotnet test (and it forwards to the adapter) a TestExecution.TestResult for each test with the [individual result](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/TestResult.cs) of the test. -6. After all tests finish, the runner sends a TestRunner.Completed message to dotnet test, which dotnet test sends as TestExecution.Completed to the adapter. -7. Once the adapter is done, it sends dotnet test a TestSession.Terminate which will cause dotnet test to shutdown. + "frameworks": { + "netcoreapp1.0": { + "imports": [ + "dnxcore50", + "portable-net45+win8" + ] + } + } +} +``` +`dotnet test` supports two running modes: -#### Test discovery -![alt tag](../../../..//Documentation/images/DotnetTestDiscoverTests.png) +1. Console: In console mode, `dotnet test` simply executes fully any command gets passed to it and outputs the results. Anytime you invoke `dotnet test` without passing --port, it runs in console mode, which in turn will cause the runner to run in console mode. +2. Design time: used in the context of other tools, such as editors or Integrated Development Environments (IDEs). You can find out more about this mode in the [dotnet-test protocol](../../../../Documentation/dotnet-test-protocol.md) document. -1. After the optional version check, the adapter sends a TestDiscovery.Start message. Because in this case, the adapter does not need to attach to the process, dotnet test will start the runner itself. Also, since there is no long list of arguments to be passed to the runner, no --wait-command flag is needed to be passed to the runner. dotnet test only passes a --list argument to the runner, which means the runner should not run the tests, just list them. -2. The runner then sends dotnet test (and it passes forward to the adapter) a TestDiscovery.TestFound for each [test](https://github.com/dotnet/cli/blob/rel/1.0.0/src/Microsoft.Extensions.Testing.Abstractions/Test.cs) found. -3. After all tests are discovered, the runner sends a TestRunner.Completed message to dotnet test, which dotnet test sends as TestDiscovery.Completed to the adapter. -4. Once the adapter is done, it sends dotnet test a TestSession.Terminate which will cause dotnet test to shutdown. +## OPTIONS -## Dotnet test parameters +`[project]` + +Specifies a path to the test project. If omitted, it defaults to current directory. -Any parameters not accepted by dotnet test will be forwarded to the runner. -This is the list of parameters supported by dotnet test from its own help print out: +`-c`, `--configuration` [Debug|Release] -Usage: dotnet test [arguments] [options] +Configuration under which to build. The default value is Release. -Arguments: - The project to test, defaults to the current directory. Can be a path to a project.json or a project directory. +`-o`, `--output` [DIR] -Options: - -?|-h|--help Show help information - --parentProcessId Used by IDEs to specify their process ID. Test will exit if the parent process does. - --port Used by IDEs to specify a port number to listen for a connection. - -c|--configuration Configuration under which to build - -o|--output Directory in which to find the binaries to be run - -b|--build-base-path Directory in which to find temporary outputs - -f|--framework Looks for test binaries for a specific framework - -r|--runtime Look for test binaries for a for the specified runtime - --no-build Do not build project before testing +Directory in which to find binaries to run. -### Minimum parameters that the runner needs to support +`-b`, `--build-base-path` [DIR] -* AssemblyUnderTest: Path to the dll that contains the tests to be run. -* --port: Used by dotnet test to specify a port number that the runner should connect to. -* --list: Indicates that the tests should only be listed and not executed. -* --designtime: Indicates that the runner is running in design time, for instance, inside an adapter. -* --wait-command: Indicates that the runner should wait to receive commands through the TCP channel instead of running tests right away. We use this to get around the command line size limit. +Directory in which to place temporary outputs. + +`-f`, `--framework` [FRAMEWORK] + +Looks for test binaries for a specific framework. + +`-r`, `--runtime` [RUNTIME_IDENTIFIER] + +Look for test binaries for a for the specified runtime. + +`--no-build` + +Does not build the test project prior to running it. + +--parentProcessId + +Used by IDEs to specify their process ID. Test will exit if the parent process does. + +`--port` + +Used by IDEs to specify a port number to listen for a connection. + +## EXAMPLES + +`dotnet test` + +Runs the tests in the project in the current directory. + +`dotnet test /projects/test1/project.json` + +Runs the tests in the test1 project. From e0444d5a94fd3d87ac8b13b6720f2bd0ac8ad1b1 Mon Sep 17 00:00:00 2001 From: PiotrP Date: Tue, 14 Jun 2016 07:29:35 -0700 Subject: [PATCH 88/97] Temporarily disable dotnet-compile-fsc https://github.com/dotnet/cli/issues/3558 --- build_projects/dotnet-cli-build/PackageTargets.cs | 3 ++- build_projects/dotnet-cli-build/TestTargets.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build_projects/dotnet-cli-build/PackageTargets.cs b/build_projects/dotnet-cli-build/PackageTargets.cs index 20ffe99cd..546c4971e 100644 --- a/build_projects/dotnet-cli-build/PackageTargets.cs +++ b/build_projects/dotnet-cli-build/PackageTargets.cs @@ -13,7 +13,8 @@ namespace Microsoft.DotNet.Cli.Build { public static readonly string[] ProjectsToPack = new string[] { - "dotnet-compile-fsc", + // TODO: https://github.com/dotnet/cli/issues/3558 + // "dotnet-compile-fsc", "Microsoft.DotNet.Cli.Utils", "Microsoft.DotNet.Compiler.Common", "Microsoft.DotNet.Files", diff --git a/build_projects/dotnet-cli-build/TestTargets.cs b/build_projects/dotnet-cli-build/TestTargets.cs index 2c3a9c394..413f411a4 100644 --- a/build_projects/dotnet-cli-build/TestTargets.cs +++ b/build_projects/dotnet-cli-build/TestTargets.cs @@ -24,7 +24,8 @@ namespace Microsoft.DotNet.Cli.Build "dotnet-build.Tests", "dotnet-compile.Tests", "dotnet-compile.UnitTests", - "dotnet-compile-fsc.Tests", + // TODO: https://github.com/dotnet/cli/issues/3558 + // "dotnet-compile-fsc.Tests", "dotnet-new.Tests", "dotnet-pack.Tests", "dotnet-projectmodel-server.Tests", From 871d25a8a5c185e0538128647ab58520a7ce840b Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Tue, 14 Jun 2016 10:29:23 -0700 Subject: [PATCH 89/97] Add LZMA to THIRD-PARTY-NOTICES + (c) header This adds LZMA to the THIRD-PARTY-NOTICES list for CLI. Since we've modified the SDK in porting it to .NET Core and minor bugfixes we've also been advised to add the .NET Foundation copyright header. --- THIRD-PARTY-NOTICES | 7 +++++++ src/Microsoft.DotNet.Archive/LZMA/Common/CRC.cs | 3 +++ src/Microsoft.DotNet.Archive/LZMA/Common/InBuffer.cs | 3 +++ src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs | 3 +++ .../LZMA/Compress/LZ/IMatchFinder.cs | 3 +++ src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzBinTree.cs | 3 +++ .../LZMA/Compress/LZ/LzInWindow.cs | 3 +++ .../LZMA/Compress/LZ/LzOutWindow.cs | 3 +++ .../LZMA/Compress/LZMA/LzmaBase.cs | 3 +++ .../LZMA/Compress/LZMA/LzmaDecoder.cs | 3 +++ .../LZMA/Compress/LZMA/LzmaEncoder.cs | 3 +++ .../LZMA/Compress/RangeCoder/RangeCoder.cs | 3 +++ .../LZMA/Compress/RangeCoder/RangeCoderBit.cs | 3 +++ .../LZMA/Compress/RangeCoder/RangeCoderBitTree.cs | 3 +++ src/Microsoft.DotNet.Archive/LZMA/ICoder.cs | 3 +++ 15 files changed, 49 insertions(+) diff --git a/THIRD-PARTY-NOTICES b/THIRD-PARTY-NOTICES index 962904c66..d6df8c431 100644 --- a/THIRD-PARTY-NOTICES +++ b/THIRD-PARTY-NOTICES @@ -11,6 +11,13 @@ bring it to our attention. Post an issue or email us: The attached notices are provided for information only. +License notice for LZMA SDK +--------------------------- + +http://www.7-zip.org/sdk.html + +LZMA is placed in the public domain. + License notice for RFC 3492 --------------------------- diff --git a/src/Microsoft.DotNet.Archive/LZMA/Common/CRC.cs b/src/Microsoft.DotNet.Archive/LZMA/Common/CRC.cs index 82cc857ef..5d38bf911 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Common/CRC.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Common/CRC.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + // Common/CRC.cs namespace SevenZip diff --git a/src/Microsoft.DotNet.Archive/LZMA/Common/InBuffer.cs b/src/Microsoft.DotNet.Archive/LZMA/Common/InBuffer.cs index 7c51f0bc0..a26bf4a29 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Common/InBuffer.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Common/InBuffer.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + // InBuffer.cs namespace SevenZip.Buffer diff --git a/src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs b/src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs index 58c79544d..429bccfc9 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Common/OutBuffer.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + // OutBuffer.cs namespace SevenZip.Buffer diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/IMatchFinder.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/IMatchFinder.cs index 10ca2b37f..2916aedb0 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/IMatchFinder.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/IMatchFinder.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + // IMatchFinder.cs using System; diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzBinTree.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzBinTree.cs index c1c006b63..017cf8ea2 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzBinTree.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzBinTree.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + // LzBinTree.cs using System; diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzInWindow.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzInWindow.cs index 52d23ce39..1ee8282f1 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzInWindow.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzInWindow.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + // LzInWindow.cs using System; diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzOutWindow.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzOutWindow.cs index c998584ac..479ae4f13 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzOutWindow.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZ/LzOutWindow.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + // LzOutWindow.cs namespace SevenZip.Compression.LZ diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaBase.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaBase.cs index c7bca86f5..f4a8f823f 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaBase.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaBase.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + // LzmaBase.cs namespace SevenZip.Compression.LZMA diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs index a94b7dd25..95d42eed0 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaDecoder.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + // LzmaDecoder.cs using System; diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaEncoder.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaEncoder.cs index 0237c51f1..527a67e0c 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaEncoder.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/LZMA/LzmaEncoder.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + // LzmaEncoder.cs using System; diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoder.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoder.cs index a4ef8ee32..d9c2e30ce 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoder.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoder.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + using System; namespace SevenZip.Compression.RangeCoder diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBit.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBit.cs index 4f0346d17..46d27ed0f 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBit.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBit.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + using System; namespace SevenZip.Compression.RangeCoder diff --git a/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBitTree.cs b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBitTree.cs index 4b4506f9d..f7985c47b 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBitTree.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/Compress/RangeCoder/RangeCoderBitTree.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + using System; namespace SevenZip.Compression.RangeCoder diff --git a/src/Microsoft.DotNet.Archive/LZMA/ICoder.cs b/src/Microsoft.DotNet.Archive/LZMA/ICoder.cs index 9ce106419..992f6823f 100644 --- a/src/Microsoft.DotNet.Archive/LZMA/ICoder.cs +++ b/src/Microsoft.DotNet.Archive/LZMA/ICoder.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + // ICoder.h using System; From 482a3377cad36e712f366a71fe357704c64867de Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Tue, 14 Jun 2016 10:56:08 -0700 Subject: [PATCH 90/97] add deb deps to ubuntu 16 dockerfile --- scripts/docker/ubuntu.16.04/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/docker/ubuntu.16.04/Dockerfile b/scripts/docker/ubuntu.16.04/Dockerfile index fa7cf4ccc..093ade8a3 100644 --- a/scripts/docker/ubuntu.16.04/Dockerfile +++ b/scripts/docker/ubuntu.16.04/Dockerfile @@ -21,6 +21,13 @@ RUN rm -rf rm -rf /var/lib/apt/lists/* && \ sudo && \ apt-get clean +# Install Build Prereqs +RUN apt-get -qqy install \ + debhelper \ + build-essential \ + devscripts && \ + apt-get clean + # Dependencies for CoreCLR and CoreFX RUN apt-get install -y libunwind8 \ libkrb5-3 \ From b37ddf735023b2d294b34cfa2d37cf0d44822749 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Tue, 14 Jun 2016 12:51:04 -0700 Subject: [PATCH 91/97] mark InternalAbstractions and DependencyModel Stable --- src/Microsoft.DotNet.InternalAbstractions/project.json | 2 +- src/Microsoft.Extensions.DependencyModel/project.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.DotNet.InternalAbstractions/project.json b/src/Microsoft.DotNet.InternalAbstractions/project.json index df3817ea1..8e9b60d58 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/project.json +++ b/src/Microsoft.DotNet.InternalAbstractions/project.json @@ -1,6 +1,6 @@ { "description": "Abstractions for making code that uses file system and environment testable.", - "version": "1.0.0-rc3-*", + "version": "1.0.0", "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index cdaa04b26..1771e6ddf 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -1,6 +1,6 @@ { "description": "Abstractions for reading `.deps` files.", - "version": "1.0.0-rc3-*", + "version": "1.0.0", "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk" From 8dd24799657c36b0cba043fdd71fb26fcaf99c32 Mon Sep 17 00:00:00 2001 From: Lakshmi Priya Date: Tue, 14 Jun 2016 13:20:29 -0700 Subject: [PATCH 92/97] Check if project.json exists before creating new project in the same dir (#3543) * Check if project.json exists before creating new project in the same dir. * Change error message. --- src/dotnet/commands/dotnet-new/Program.cs | 23 +++++++++++++++++-- .../GivenThatIWantANewCSApp.cs | 21 +++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/dotnet/commands/dotnet-new/Program.cs b/src/dotnet/commands/dotnet-new/Program.cs index 4e971e51a..e22cce0d6 100644 --- a/src/dotnet/commands/dotnet-new/Program.cs +++ b/src/dotnet/commands/dotnet-new/Program.cs @@ -26,6 +26,13 @@ namespace Microsoft.DotNet.Tools.New public int CreateEmptyProject(string languageName, string templateDir) { + // Check if project.json exists in the folder + if (File.Exists(Path.Combine(Directory.GetCurrentDirectory(), "project.json"))) + { + Reporter.Error.WriteLine($"Creating new {languageName} project failed, project already exists."); + return 1; + } + var thisAssembly = typeof(NewCommand).GetTypeInfo().Assembly; var resources = from resourceName in thisAssembly.GetManifestResourceNames() where resourceName.Contains(templateDir) @@ -43,6 +50,17 @@ namespace Microsoft.DotNet.Tools.New try { + // Check if other files from the template exists already, before extraction + IEnumerable fileNames = archive.Entries.Select(e => e.FullName); + foreach (var entry in fileNames) + { + if (File.Exists(Path.Combine(Directory.GetCurrentDirectory(), entry))) + { + Reporter.Error.WriteLine($"Creating new {languageName} project failed, directory already contains {entry}"); + return 1; + } + } + archive.ExtractToDirectory(Directory.GetCurrentDirectory()); File.Move( @@ -82,11 +100,12 @@ namespace Microsoft.DotNet.Tools.New var type = app.Option("-t|--type ", "Type of project", CommandOptionType.SingleValue); var dotnetNew = new NewCommand(); - app.OnExecute(() => { + app.OnExecute(() => + { var csharp = new { Name = "C#", Alias = new[] { "c#", "cs", "csharp" }, TemplatePrefix = "CSharp", Templates = new[] { "Console", "Web", "Lib", "xunittest" } }; var fsharp = new { Name = "F#", Alias = new[] { "f#", "fs", "fsharp" }, TemplatePrefix = "FSharp", Templates = new[] { "Console" } }; - + string languageValue = lang.Value() ?? csharp.Name; var language = new[] { csharp, fsharp } diff --git a/test/dotnet-new.Tests/GivenThatIWantANewCSApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewCSApp.cs index e5f98313a..b1fb921df 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewCSApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewCSApp.cs @@ -52,6 +52,27 @@ namespace Microsoft.DotNet.Tests buildResult.Should().Pass(); buildResult.Should().NotHaveStdErr(); } + + [Fact] + public void When_dotnet_new_is_invoked_mupliple_times_it_should_fail() + { + var rootPath = Temp.CreateDirectory().Path; + + new TestCommand("dotnet") { WorkingDirectory = rootPath } + .Execute("new"); + + DateTime expectedState = Directory.GetLastWriteTime(rootPath); + + var result = new TestCommand("dotnet") { WorkingDirectory = rootPath } + .ExecuteWithCapturedOutput("new"); + + DateTime actualState = Directory.GetLastWriteTime(rootPath); + + Assert.Equal(expectedState, actualState); + + result.Should().Fail(); + result.Should().HaveStdErr(); + } private static void AddProjectJsonDependency(string projectJsonPath, string dependencyId, string dependencyVersion) { From 638e4c7d0089700ff4efc1062577340304c8a466 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Tue, 14 Jun 2016 13:33:06 -0700 Subject: [PATCH 93/97] Fix HostFXR in dotnet-dev package --- .../dotnet-cli-build/PackageTargets.cs | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/build_projects/dotnet-cli-build/PackageTargets.cs b/build_projects/dotnet-cli-build/PackageTargets.cs index 546c4971e..af80d1f0e 100644 --- a/build_projects/dotnet-cli-build/PackageTargets.cs +++ b/build_projects/dotnet-cli-build/PackageTargets.cs @@ -28,6 +28,7 @@ namespace Microsoft.DotNet.Cli.Build [Target(nameof(PackageTargets.CopyCLISDKLayout), nameof(PackageTargets.CopySharedHostLayout), + nameof(PackageTargets.CopyHostFxrLayout), nameof(PackageTargets.CopySharedFxLayout), nameof(PackageTargets.CopyCombinedFrameworkSDKHostLayout), nameof(PackageTargets.CopyCombinedFrameworkSDKLayout))] @@ -103,6 +104,23 @@ namespace Microsoft.DotNet.Cli.Build return c.Success(); } + [Target] + public static BuildTargetResult CopyHostFxrLayout(BuildTargetContext c) + { + var hostFxrRoot = Path.Combine(Dirs.Output, "obj", "hostFxr"); + if (Directory.Exists(hostFxrRoot)) + { + Utils.DeleteDirectory(hostFxrRoot); + } + Directory.CreateDirectory(hostFxrRoot); + + Utils.CopyDirectoryRecursively(Path.Combine(Dirs.Stage2, "host"), hostFxrRoot, true); + FixPermissions(hostFxrRoot); + + c.BuildContext["HostFxrPublishRoot"] = hostFxrRoot; + return c.Success(); + } + [Target] public static BuildTargetResult CopySharedFxLayout(BuildTargetContext c) { @@ -138,6 +156,9 @@ namespace Microsoft.DotNet.Cli.Build string sharedHostPublishRoot = c.BuildContext.Get("SharedHostPublishRoot"); Utils.CopyDirectoryRecursively(sharedHostPublishRoot, combinedRoot); + string hostFxrPublishRoot = c.BuildContext.Get("HostFxrPublishRoot"); + Utils.CopyDirectoryRecursively(hostFxrPublishRoot, combinedRoot); + c.BuildContext["CombinedFrameworkSDKHostRoot"] = combinedRoot; return c.Success(); } From 0cd5afb87cf7af2d7e3e99dc487d7605cba42314 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 14 Jun 2016 14:49:17 -0500 Subject: [PATCH 94/97] Updating DiaSymReader to 1.0.8 --- src/Microsoft.Extensions.Testing.Abstractions/project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 7fa46aded..7acc23daa 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -11,7 +11,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.DiaSymReader": "1.0.8-rc2-60610-01", + "Microsoft.DiaSymReader": "1.0.8", "Microsoft.DiaSymReader.Native": "1.4.0-rc2" }, "frameworks": { From bc610340f3838b45562028d2184e58a7fdf75f43 Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Tue, 14 Jun 2016 14:49:24 -0700 Subject: [PATCH 95/97] Fix eula.rtf formatting --- .../osx/clisdk/resources/cs.lproj/eula.rtf | 153 ++++++++---------- .../osx/clisdk/resources/de.lproj/eula.rtf | 153 ++++++++---------- .../osx/clisdk/resources/en.lproj/eula.rtf | 153 ++++++++---------- .../osx/clisdk/resources/es.lproj/eula.rtf | 153 ++++++++---------- .../osx/clisdk/resources/fr.lproj/eula.rtf | 153 ++++++++---------- .../osx/clisdk/resources/it.lproj/eula.rtf | 153 ++++++++---------- .../osx/clisdk/resources/ja.lproj/eula.rtf | 153 ++++++++---------- .../osx/clisdk/resources/ko.lproj/eula.rtf | 153 ++++++++---------- .../osx/clisdk/resources/pl.lproj/eula.rtf | 153 ++++++++---------- .../osx/clisdk/resources/pt-br.lproj/eula.rtf | 153 ++++++++---------- .../osx/clisdk/resources/ru.lproj/eula.rtf | 153 ++++++++---------- .../osx/clisdk/resources/tr.lproj/eula.rtf | 153 ++++++++---------- .../clisdk/resources/zh-hans.lproj/eula.rtf | 153 ++++++++---------- .../clisdk/resources/zh-hant.lproj/eula.rtf | 153 ++++++++---------- 14 files changed, 952 insertions(+), 1190 deletions(-) diff --git a/packaging/osx/clisdk/resources/cs.lproj/eula.rtf b/packaging/osx/clisdk/resources/cs.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/cs.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/de.lproj/eula.rtf b/packaging/osx/clisdk/resources/de.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/de.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/de.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/en.lproj/eula.rtf b/packaging/osx/clisdk/resources/en.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/en.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/en.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/es.lproj/eula.rtf b/packaging/osx/clisdk/resources/es.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/es.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/es.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/fr.lproj/eula.rtf b/packaging/osx/clisdk/resources/fr.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/fr.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/it.lproj/eula.rtf b/packaging/osx/clisdk/resources/it.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/it.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/it.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/ja.lproj/eula.rtf b/packaging/osx/clisdk/resources/ja.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/ja.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/ko.lproj/eula.rtf b/packaging/osx/clisdk/resources/ko.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/ko.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/pl.lproj/eula.rtf b/packaging/osx/clisdk/resources/pl.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/pl.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/eula.rtf b/packaging/osx/clisdk/resources/pt-br.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/pt-br.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/ru.lproj/eula.rtf b/packaging/osx/clisdk/resources/ru.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/ru.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/tr.lproj/eula.rtf b/packaging/osx/clisdk/resources/tr.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/tr.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/eula.rtf b/packaging/osx/clisdk/resources/zh-hans.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/eula.rtf b/packaging/osx/clisdk/resources/zh-hant.lproj/eula.rtf index 29257296c..7f40e11a8 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/eula.rtf +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/eula.rtf @@ -1,114 +1,97 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Calibri;}{\f3\fnil\fcharset2 Symbol;}} -{\colortbl ;\red0\green0\blue255;\red31\green73\blue125;} -{\*\listtable -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx360} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc2\leveljc0\levelstartat1{\leveltext\'02\'02.;}{\levelnumbers\'01;}\jclisttab\tx720}\listid1 } -{\list\listhybrid -{\listlevel\levelnfc0\leveljc0\levelstartat1{\leveltext\'02\'00.;}{\levelnumbers\'01;}\jclisttab\tx363} -{\listlevel\levelnfc4\leveljc0\levelstartat1{\leveltext\'02\'01.;}{\levelnumbers\'01;}\jclisttab\tx363}\listid2 }} -{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\nowidctlpar\sb120\sa120\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\par +{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} +{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} +{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 +\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par +\fs24 MICROSOFT .NET LIBRARY\fs28\par +\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par -\pard\brdrb\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 MICROSOFT .NET LIBRARY \par +\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par -\pard\nowidctlpar\sb120\sa120\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120\b0 updates,\par -{\pntext\f3\'B7\tab}supplements,\par -{\pntext\f3\'B7\tab}Internet-based services, and\par -{\pntext\f3\'B7\tab}support services\par - -\pard\nowidctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par +\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par -\pard\brdrt\brdrs\brdrw10\brsp20 \nowidctlpar\sb120\sa120 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par -\pard -{\listtext\f0 1.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120 INSTALLATION AND USE RIGHTS. \par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 Installation and Use.\b0\fs20 You may install and use any number of copies of the software to design, develop and test your programs.\par -{\listtext\f0 b.\tab}\b\fs19 Third Party Programs.\b0\fs20 The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par +\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par -\pard -{\listtext\f0 2.\tab}\jclisttab\tx360\ls1\nowidctlpar\fi-357\li357\sb120\sa120\fs20 DATA. \b0 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at {{\field{\*\fldinst{HYPERLINK http://go.microsoft.com/fwlink/?LinkId=528096.Your }}{\fldrslt{http://go.microsoft.com/fwlink/?LinkId=528096.Your\ul0\cf0}}}}\f0\fs20 use of the software operates as your consent to these practices.\b\par -{\listtext\f0 3.\tab}ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls1\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 DISTRIBUTABLE CODE.\~ \b0 The software is comprised of Distributable Code. \f1\ldblquote\f0 Distributable Code\f1\rdblquote\f0 is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par -\pard -{\listtext\f0 i.\tab}\jclisttab\tx720\ls1\ilvl2\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077 Right to Use and Distribute. \par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 You may copy and distribute the object code form of the software.\par -{\pntext\f3\'B7\tab}Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b ii.\tab Distribution Requirements.\b0 \b For any Distributable Code you distribute, you must\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 add significant primary functionality to it in your programs;\par -{\pntext\f3\'B7\tab}require distributors and external end users to agree to terms that protect it at least as much as this agreement;\par -{\pntext\f3\'B7\tab}display your valid copyright notice on your programs; and\par -{\pntext\f3\'B7\tab}indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\par +\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par -\pard\nowidctlpar\fi-357\li1077\sb120\sa120\tx1077\b iii.\tab Distribution Restrictions.\b0 \b You may not\par +\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-357\li1434\sb120\sa120\b0 alter any copyright, trademark or patent notice in the Distributable Code;\par -{\pntext\f3\'B7\tab}use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\par -{\pntext\f3\'B7\tab}include Distributable Code in malicious, deceptive or unlawful programs; or\par -{\pntext\f3\'B7\tab}modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\par +\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par +\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\fi-358\li1792\sb120\sa120 the code be disclosed or distributed in source code form; or\cf2\f2\par -{\pntext\f3\'B7\tab}\cf0\f0 others have the right to modify it.\cf2\f2\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\cf0\b\f0 3.\tab\fs19 SCOPE OF LICENSE. \b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 work around any technical limitations in the software;\par -{\pntext\f3\'B7\tab}reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -{\pntext\f3\'B7\tab}publish the software for others to copy;\par -{\pntext\f3\'B7\tab}rent, lease or lend the software;\par -{\pntext\f3\'B7\tab}transfer the software or this agreement to any third party; or\par -{\pntext\f3\'B7\tab}use the software for commercial software hosting services.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par +\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par +\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par +\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par +\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par +\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\b\fs20 4.\tab\fs19 BACKUP COPY. \b0 You may make one backup copy of the software. You may use it only to reinstall the software.\par -\b\fs20 5.\tab\fs19 DOCUMENTATION. \b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\par -\b\fs20 6.\tab\fs19 EXPORT RESTRICTIONS. \b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see {\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\fs20\par -\b 7.\tab\fs19 SUPPORT SERVICES. \b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\par -\b\fs20 8.\tab\fs19 ENTIRE AGREEMENT. \b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\par -\b\fs20 9.\tab\fs19 APPLICABLE LAW.\par +\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par +\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par -\pard -{\listtext\f0 a.\tab}\jclisttab\tx363\ls2\ilvl1\nowidctlpar\fi-363\li720\sb120\sa120 United States. \b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\par -{\listtext\f0 b.\tab}\b Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par +\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par -\pard -{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent360\pnstart1\pndec{\pntxta.}} -\nowidctlpar\fi-357\li357\sb120\sa120 LEGAL EFFECT. \b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\par -{\pntext\f0 2.\tab}\b DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par +\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par -\pard\nowidctlpar\li357\sb120\sa120 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\par +\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par -\pard\nowidctlpar\fi-357\li357\sb120\sa120\fs20 12.\tab\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par +\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par -\pard\nowidctlpar\li357\sb120\sa120\b0 This limitation applies to\par +\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par +\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent363{\pntxtb\'B7}}\nowidctlpar\fi-363\li720\sb120\sa120 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -{\pntext\f3\'B7\tab}claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par +\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par +\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par +\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par +\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par +LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par +\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par -\pard\nowidctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\par -Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\par -\b\lang1033 EXON\'c9RATION DE GARANTIE. \b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\par -\b LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES. \b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\par -\lang9 Cette limitation concerne :\par +\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par -\pard{\pntext\f3\'B7\tab}{\*\pn\pnlvlblt\pnf3\pnindent360{\pntxtb\'B7}}\nowidctlpar\li720\sb120\sa120 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\par -{\pntext\f3\'B7\tab}les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\par +\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par -\pard\nowidctlpar\sb120\sa120 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\par -\b\lang1033 EFFET JURIDIQUE. \b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\par -\b\fs20\lang1036\par +\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par +\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par +\kerning0\fs20\lang1036\~\fs19\lang1033\par + +\pard\widctlpar\cf0\b0\f3\fs24\par } \ No newline at end of file From 658083d71b55654502df49823b077f3f1658a0da Mon Sep 17 00:00:00 2001 From: Zlatko Knezevic Date: Tue, 14 Jun 2016 21:58:32 -0700 Subject: [PATCH 96/97] [DO NOT MERGE] Update known-issues.md (#3559) * Update known-issues.md Add a better blurb about virtual networking. Apple warning explanation added. Adding the Nano server workaround instructions. --- Documentation/known-issues.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Documentation/known-issues.md b/Documentation/known-issues.md index fbc54d56d..3e99d0f22 100644 --- a/Documentation/known-issues.md +++ b/Documentation/known-issues.md @@ -12,6 +12,12 @@ brew install openssl brew link --force openssl ``` +Homebrew may also show the following warning: + +> Apple has deprecated use of OpenSSL in favor of its own TLS and crypto libraries + +This warning is meant for the software that uses OpenSSL (in this case, .NET Core) and not for the end-user that is installing said software. Homebrew installation doesn't touch either the existing Apple crypto libraries or existing OpenSSL 0.9.8 version, so there is no impact on any software that uses either one of those crypto solutions and is already installed. + MacPorts doesn't have the concept of linking, so it is reccomended that you uninstall 0.9.8 version of OpenSSL using the following command: ```console @@ -21,6 +27,16 @@ sudo port -f uninstall openssl @0.9.8 You can verify whether you have the right version using the `openssl version` command from the Terminal. +## Running .NET Core CLI on Nano Server + +If you’re using Nano Server Technical Preview 5 with .NET Core CLI, you will need to copy all DLL files from c:\windows\system32\forwarders to c:\windows\system32, due to a bug that has since been fixed in later releases. + +If you use “dotnet publish”, make sure to copy all DLL files from c:\windows\system32\forwarders to your publish directory as well. + +If your Nano Server Technical Preview 5 build is updated or serviced, please make sure to repeat this process, in case any of the DLLs have been updated as well. + +Apologies for any inconvenience. Again, this has been fixed in later releases. + ## Users of zsh (z shell) don't get `dotnet` on the path after install There is a known issue in oh-my-zsh installer that interferes with how `path_helper` works on OS X systems. In short, the said installer creates a `.zshrc` file which contains the exploded path at the time of installation. This clobbers @@ -55,7 +71,7 @@ When using non-release versions of the CLI, `dotnet restore` will fail to restor ``` ## `dotnet restore` times out on Win7 x64 -If you have Virtual Box and you try to use the CLI on a Win7 x64 machine, `dotnet restore` will be really slow and will eventually time out without doing much restoring. +If you have any virtualization software (so far we've confirmed VMWare and Virtual Box) and you try to use the CLI on a Win7 SP1 x64 machine, `dotnet restore` will be really slow and will eventually time out without doing much restoring. The issue is in the virtual networking adapters that usually get installed with said software. **Issues tracking this:** @@ -63,7 +79,7 @@ If you have Virtual Box and you try to use the CLI on a Win7 x64 machine, `dotne **Affects:** `dotnet restore` -**Workaround:** disable the VirtualBox network interface and do the restore. +**Workaround:** disable the virtual network interface and do the restore. ## Resolving the Standard library packages The StdLib package is on a MyGet feed. In order to restore it, a MyGet feed needs to be added From 6b54ae0bcc5c63e7c989ac19d851f234f9172bea Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 14 Jun 2016 14:55:59 -0700 Subject: [PATCH 97/97] Trim platfrom libraries from deps fiels --- .../Executable.cs | 21 ++++++---- .../ProjectModelPlatformExtensions.cs | 5 +++ .../DependencyContextJsonReader.cs | 11 ++++- .../DependencyContextStrings.cs | 2 + .../DependencyContextWriter.cs | 4 ++ .../commands/dotnet-publish/PublishCommand.cs | 12 +++--- .../DependencyContextJsonReaderTest.cs | 42 +++++++++++++++++++ .../DependencyContextJsonWriterTests.cs | 30 +++++++++++++ 8 files changed, 113 insertions(+), 14 deletions(-) diff --git a/src/Microsoft.DotNet.Compiler.Common/Executable.cs b/src/Microsoft.DotNet.Compiler.Common/Executable.cs index 29a602a70..52ebbe924 100644 --- a/src/Microsoft.DotNet.Compiler.Common/Executable.cs +++ b/src/Microsoft.DotNet.Compiler.Common/Executable.cs @@ -157,9 +157,12 @@ namespace Microsoft.DotNet.Cli.Compiler.Common private void WriteDepsFileAndCopyProjectDependencies(LibraryExporter exporter) { - // When called this way we don't need to filter exports, so we pass the same list to both. var exports = exporter.GetAllExports().ToList(); - WriteConfigurationFiles(exports, exports, includeDevConfig: true); + var exportsLookup = exports.ToDictionary(e => e.Library.Identity.Name); + var platformExclusionList = _context.GetPlatformExclusionList(exportsLookup); + var filteredExports = exports.FilterExports(platformExclusionList); + + WriteConfigurationFiles(exports, filteredExports, exports, includeDevConfig: true); var projectExports = exporter.GetAllProjectTypeDependencies(); CopyAssemblies(projectExports); @@ -169,9 +172,13 @@ namespace Microsoft.DotNet.Cli.Compiler.Common CopyAssets(packageExports); } - public void WriteConfigurationFiles(IEnumerable allExports, IEnumerable depsExports, bool includeDevConfig) + public void WriteConfigurationFiles( + IEnumerable allExports, + IEnumerable depsRuntimeExports, + IEnumerable depsCompilationExports, + bool includeDevConfig) { - WriteDeps(depsExports); + WriteDeps(depsRuntimeExports, depsCompilationExports); if (_context.ProjectFile.HasRuntimeOutput(_configuration)) { WriteRuntimeConfig(allExports); @@ -272,7 +279,7 @@ namespace Microsoft.DotNet.Cli.Compiler.Common runtimeOptions.Add("additionalProbingPaths", additionalProbingPaths); } - public void WriteDeps(IEnumerable exports) + public void WriteDeps(IEnumerable runtimeExports, IEnumerable compilationExports) { Directory.CreateDirectory(_runtimeOutputPath); @@ -280,8 +287,8 @@ namespace Microsoft.DotNet.Cli.Compiler.Common var dependencyContext = new DependencyContextBuilder().Build( compilerOptions: includeCompile ? _compilerOptions : null, - compilationExports: includeCompile ? exports : null, - runtimeExports: exports, + compilationExports: includeCompile ? compilationExports : null, + runtimeExports: runtimeExports, portable: _context.IsPortable, target: _context.TargetFramework, runtime: _context.RuntimeIdentifier ?? string.Empty); diff --git a/src/Microsoft.DotNet.ProjectModel/ProjectModelPlatformExtensions.cs b/src/Microsoft.DotNet.ProjectModel/ProjectModelPlatformExtensions.cs index 11ef13c52..5f6ea1b94 100644 --- a/src/Microsoft.DotNet.ProjectModel/ProjectModelPlatformExtensions.cs +++ b/src/Microsoft.DotNet.ProjectModel/ProjectModelPlatformExtensions.cs @@ -64,5 +64,10 @@ namespace Microsoft.DotNet.ProjectModel } } } + + public static IEnumerable FilterExports(this IEnumerable exports, HashSet exclusionList) + { + return exports.Where(e => !exclusionList.Contains(e.Library.Identity.Name)); + } } } diff --git a/src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs b/src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs index 730fa9f63..5d3ac12fa 100644 --- a/src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs +++ b/src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs @@ -178,7 +178,9 @@ namespace Microsoft.Extensions.DependencyModel { return Enumerable.Empty(); } - return librariesObject.Properties().Select(property => ReadLibrary(property, runtime, libraryStubs)); + return librariesObject.Properties() + .Select(property => ReadLibrary(property, runtime, libraryStubs)) + .Where(library => library != null); } private Library ReadLibrary(JProperty property, bool runtime, Dictionary libraryStubs) @@ -202,6 +204,13 @@ namespace Microsoft.Extensions.DependencyModel if (runtime) { + // Runtime section of this library was trimmed by type:platform + var isCompilationOnly = libraryObject.Value(DependencyContextStrings.CompilationOnlyPropertyName); + if (isCompilationOnly == true) + { + return null; + } + var runtimeTargetsObject = (JObject)libraryObject[DependencyContextStrings.RuntimeTargetsPropertyName]; var entries = ReadRuntimeTargetEntries(runtimeTargetsObject).ToArray(); diff --git a/src/Microsoft.Extensions.DependencyModel/DependencyContextStrings.cs b/src/Microsoft.Extensions.DependencyModel/DependencyContextStrings.cs index 393a1f493..ab457bca1 100644 --- a/src/Microsoft.Extensions.DependencyModel/DependencyContextStrings.cs +++ b/src/Microsoft.Extensions.DependencyModel/DependencyContextStrings.cs @@ -74,5 +74,7 @@ namespace Microsoft.Extensions.DependencyModel internal const string ResourceAssembliesPropertyName = "resources"; internal const string LocalePropertyName = "locale"; + + internal const string CompilationOnlyPropertyName = "compileOnly"; } } \ No newline at end of file diff --git a/src/Microsoft.Extensions.DependencyModel/DependencyContextWriter.cs b/src/Microsoft.Extensions.DependencyModel/DependencyContextWriter.cs index 77652c240..7f9f70fa6 100644 --- a/src/Microsoft.Extensions.DependencyModel/DependencyContextWriter.cs +++ b/src/Microsoft.Extensions.DependencyModel/DependencyContextWriter.cs @@ -261,6 +261,10 @@ namespace Microsoft.Extensions.DependencyModel } AddDependencies(libraryObject, dependencies); + if (compilationLibrary != null && runtimeLibrary == null) + { + libraryObject.Add(DependencyContextStrings.CompilationOnlyPropertyName, true); + } return libraryObject; } diff --git a/src/dotnet/commands/dotnet-publish/PublishCommand.cs b/src/dotnet/commands/dotnet-publish/PublishCommand.cs index 437381f27..eebf24f66 100644 --- a/src/dotnet/commands/dotnet-publish/PublishCommand.cs +++ b/src/dotnet/commands/dotnet-publish/PublishCommand.cs @@ -140,8 +140,9 @@ namespace Microsoft.DotNet.Tools.Publish var buildExclusionList = context.GetTypeBuildExclusionList(exportsLookup); var allExclusionList = new HashSet(platformExclusionList); allExclusionList.UnionWith(buildExclusionList); + var filteredExports = exports.FilterExports(allExclusionList); - foreach (var export in FilterExports(exports, allExclusionList)) + foreach (var export in filteredExports) { Reporter.Verbose.WriteLine($"publish: Publishing {export.Library.Identity.ToString().Green().Bold()} ..."); @@ -173,7 +174,10 @@ namespace Microsoft.DotNet.Tools.Publish { // Make executable in the new location var executable = new Executable(context, buildOutputPaths, outputPath, buildOutputPaths.IntermediateOutputDirectoryPath, exporter, configuration); - executable.WriteConfigurationFiles(exports, FilterExports(exports, buildExclusionList), includeDevConfig: false); + var runtimeExports = filteredExports; + var compilationExports = exports.FilterExports(buildExclusionList); + + executable.WriteConfigurationFiles(exports, runtimeExports, compilationExports, includeDevConfig: false); } var contentFiles = new ContentFiles(context); @@ -206,10 +210,6 @@ namespace Microsoft.DotNet.Tools.Publish return true; } - private static IEnumerable FilterExports(IEnumerable exports, HashSet exclusionList) - { - return exports.Where(e => !exclusionList.Contains(e.Library.Identity.Name)); - } /// /// Filters which export's RuntimeAssets should get copied to the output path. diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs b/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs index c70de2a94..310042d82 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs +++ b/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs @@ -185,6 +185,48 @@ namespace Microsoft.Extensions.DependencyModel.Tests package.Serviceable.Should().Be(false); } + [Fact] + public void DoesNotReadRuntimeLibraryFromCompilationOnlyEntries() + { + var context = Read( +@"{ + ""targets"": { + "".NETCoreApp,Version=v1.0"": { + ""MyApp/1.0.1"": { + ""dependencies"": { + ""AspNet.Mvc"": ""1.0.0"" + }, + ""compile"": { + ""MyApp.dll"": { } + } + }, + ""System.Banana/1.0.0"": { + ""dependencies"": { + ""System.Foo"": ""1.0.0"" + }, + ""compileOnly"": true, + ""compile"": { + ""ref/dotnet5.4/System.Banana.dll"": { } + } + } + } + }, + ""libraries"":{ + ""MyApp/1.0.1"": { + ""type"": ""project"" + }, + ""System.Banana/1.0.0"": { + ""type"": ""package"", + ""serviceable"": false, + ""sha512"": ""HASH-System.Banana"" + }, + } +}"); + context.CompileLibraries.Should().HaveCount(2); + context.RuntimeLibraries.Should().HaveCount(1); + context.RuntimeLibraries[0].Name.Should().Be("MyApp"); + } + [Fact] public void ReadsRuntimeLibrariesWithSubtargetsFromMainTargetForPortable() diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonWriterTests.cs b/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonWriterTests.cs index f3d4841e9..ca4427ca4 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonWriterTests.cs +++ b/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonWriterTests.cs @@ -453,6 +453,36 @@ namespace Microsoft.Extensions.DependencyModel.Tests } + [Fact] + public void WriteCompilationOnlyAttributeIfOnlyCompilationLibraryProvided() + { + var result = Save(Create( + "Target", + "runtime", + true, + compileLibraries: new[] + { + new CompilationLibrary( + "package", + "PackageName", + "1.2.3", + "HASH", + new [] { "ref/Banana.dll" }, + new [] { + new Dependency("Fruits.Abstract.dll","2.0.0") + }, + true + ) + })); + + // targets + var targets = result.Should().HavePropertyAsObject("targets").Subject; + var target = targets.Should().HavePropertyAsObject("Target").Subject; + var library = target.Should().HavePropertyAsObject("PackageName/1.2.3").Subject; + library.Should().HavePropertyValue("compileOnly", true); + } + + [Fact] public void WritesCompilationOptions() {