diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md
index f68aebd14..ed6dc0a09 100644
--- a/Documentation/developer-guide.md
+++ b/Documentation/developer-guide.md
@@ -36,6 +36,22 @@ In order to build .NET Command Line Interface, you need the following installed
2. `dotnet restore`
3. `dotnet run`
+## Running tests
+
+All the CLI tests are located under `test`. In order to run them, after doing a restore on the CLI repo just do the following:
+
+1. Navigate to a test project, for instance: `cd test\dotnet-test.UnitTests`
+2. `dotnet test`
+
+For unit test projects (they have UnitTests at the name), that's all that you need to do, as they take a dependency on the product code directly, which gets rebuilt by dotnet when you run the tests.
+
+For E2E and functional tests, they all depend on the binaries located under `artifacts\rid\stage2\bin`. So, after changing the code, you will need to re-build the product code and copy the new bits to the folder above. For instance, imagine you changed something in dotnet itself, you would have to do the following:
+
+1. `cd src\dotnet\`
+2. `dotnet build`
+3. `cp bin\debug\netstandardapp1.5\dotnet.dll artifacts\rid\stage2\bin`
+4. `cd ..\..\test\dotnet-build.Tests`
+5. `dotnet test`
##Adding a Command
diff --git a/Documentation/known-issues.md b/Documentation/known-issues.md
index a5f8bb038..735164987 100644
--- a/Documentation/known-issues.md
+++ b/Documentation/known-issues.md
@@ -1,23 +1,6 @@
Known issues & workarounds
==========================
-## El Capitan support
-If you try to use the `dotnet` commands on El Capitan (OS X 10.11), you will encounter errors as it is not currently
-fully supported for all scenarios.
-
-**Issues tracking this:**
-
-* [#498](https://github.com/dotnet/cli/issues/498)
-* [#291](https://github.com/dotnet/cli/issues/291)
-
-**Affects:** most of the commands, but more than likely you will not be able to
-use `dotnet compile` and `dotnet-run` on El Capitan. For others, there is a
-workaround.
-
-**Workaround:** use the --runtime switch with the value of `osx.10.11-x64` in
-`dotnet restore` and `dotnet publish` and you will be able to run your app from
-the published directory.
-
## 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
to the NuGet feeds, either locally per application or in a central location.
diff --git a/Documentation/specs/runtime-configuration-file.md b/Documentation/specs/runtime-configuration-file.md
index f35de1ec7..ff2df4c33 100644
--- a/Documentation/specs/runtime-configuration-file.md
+++ b/Documentation/specs/runtime-configuration-file.md
@@ -29,7 +29,8 @@ The files are both JSON files stored in UTF-8 encoding. Below are sample files.
"gcConcurrent": false,
"framework": {
"name": "Microsoft.DotNetCore",
- "version": "1.0.1"
+ "version": "1.0.1",
+ "rollForward": false,
}
}
}
@@ -118,7 +119,11 @@ This section is copied verbatim from an identical section in the input `project.
* `gcServer` - Boolean indicating if the server GC should be used (Default: _TBD_). Note: This is designed to mirror the existing [app.config](https://msdn.microsoft.com/en-us/library/ms229357.aspx) setting)
* `gcConcurrent` - Boolean indicating if background garbage collection should be used (Default: _TBD_). Note: This is designed to mirror the existing [app.config](https://msdn.microsoft.com/en-us/library/yhwwzef8.aspx) setting).
-* `framework` - Indicates the name and version of the shared framework to use when activating the application. The presence of this section indicates that the application is a portable app designed to use a shared redistributable framework.
+* `framework` - Indicates the `name`, `version`, and other properties of the shared framework to use when activating the application. The presence of this section indicates that the application is a portable app designed to use a shared redistributable framework.
+ * `rollForward` - When `false`, the framework version is strictly obeyed by the host. When `rollForward` is unspecified or specified as `true`, the framework from either the same or a higher version that differs only in the `SemVer` patch field will be used.
+ * For example, if `version=1.0.1` and `rollForward` is `true`, the host would load the shared framework from `1.0.{n}`, where `n >= 1`, but will not load from `1.1.0`, even if present. When `rollForward` is `false`, the shared framework will be loaded from `1.0.1` strictly.
+ * **Note:** This does not apply to `SemVer`'s `prerelease` versions, but only for `production` releases.
+ * **Note:** This section will not be present for standalone applications that do not rely upon a shared framework.
* Others _TBD_
These settings are read by `corehost` to determine how to initialize the runtime. All versions of `corehost` **must ignore** settings in this section that they do not understand (thus allowing new settings to be added in later versions).
diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index faa3eb2c8..044847001 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -1,6 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
-VisualStudioVersion = 14.0.25020.0
+VisualStudioVersion = 14.0.25029.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}"
EndProject
@@ -76,6 +77,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.TestFramew
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-test.UnitTests", "test\dotnet-test.UnitTests\dotnet-test.UnitTests.xproj", "{857274AC-E741-4266-A7FD-14DEE0C1CC96}"
EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-test.Tests", "test\dotnet-test.Tests\dotnet-test.Tests.xproj", "{60C33D0A-A5D8-4AB0-9956-1F804654DF05}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "update-dependencies", "scripts\update-dependencies\update-dependencies.xproj", "{A28BD8AC-DF15-4F58-8299-98A9AE2B8726}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -472,22 +477,6 @@ Global
{0745410A-6629-47EB-AAB5-08D6288CAD72}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{0745410A-6629-47EB-AAB5-08D6288CAD72}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{0745410A-6629-47EB-AAB5-08D6288CAD72}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Debug|x64.ActiveCfg = Debug|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Debug|x64.Build.0 = Debug|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.MinSizeRel|x64.Build.0 = Debug|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Release|Any CPU.Build.0 = Release|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Release|x64.ActiveCfg = Release|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Release|x64.Build.0 = Release|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
{0B31C336-149D-471A-B7B1-27B0F1E80F83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B31C336-149D-471A-B7B1-27B0F1E80F83}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B31C336-149D-471A-B7B1-27B0F1E80F83}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -504,22 +493,22 @@ Global
{0B31C336-149D-471A-B7B1-27B0F1E80F83}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{0B31C336-149D-471A-B7B1-27B0F1E80F83}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{0B31C336-149D-471A-B7B1-27B0F1E80F83}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Debug|x64.ActiveCfg = Debug|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Debug|x64.Build.0 = Debug|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.MinSizeRel|x64.Build.0 = Debug|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Release|Any CPU.Build.0 = Release|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Release|x64.ActiveCfg = Release|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Release|x64.Build.0 = Release|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
- {857274AC-E741-4266-A7FD-14DEE0C1CC96}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Debug|x64.Build.0 = Debug|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Release|x64.ActiveCfg = Release|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.Release|x64.Build.0 = Release|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
{0724ED7C-56E3-4604-9970-25E600611383}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0724ED7C-56E3-4604-9970-25E600611383}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0724ED7C-56E3-4604-9970-25E600611383}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -536,6 +525,54 @@ Global
{0724ED7C-56E3-4604-9970-25E600611383}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{0724ED7C-56E3-4604-9970-25E600611383}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{0724ED7C-56E3-4604-9970-25E600611383}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Debug|x64.Build.0 = Debug|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Release|Any CPU.Build.0 = Release|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Release|x64.ActiveCfg = Release|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.Release|x64.Build.0 = Release|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.Debug|x64.Build.0 = Debug|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.Release|Any CPU.Build.0 = Release|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.Release|x64.ActiveCfg = Release|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.Release|x64.Build.0 = Release|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.Debug|x64.Build.0 = Debug|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.Release|x64.ActiveCfg = Release|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.Release|x64.Build.0 = Release|Any CPU
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+ {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -565,11 +602,13 @@ Global
{DA8E0E9E-A6D6-4583-864C-8F40465E3A48} = {713CBFBB-5392-438D-B766-A9A585EF1BB8}
{0138CB8F-4AA9-4029-A21E-C07C30F425BA} = {713CBFBB-5392-438D-B766-A9A585EF1BB8}
{BD4F0750-4E81-4AD2-90B5-E470881792C3} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
- {4A4711D8-4312-49FC-87B5-4F183F4C6A51} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{0745410A-6629-47EB-AAB5-08D6288CAD72} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{0E3300A4-DF54-40BF-87D8-E7658330C288} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{0B31C336-149D-471A-B7B1-27B0F1E80F83} = {0E3300A4-DF54-40BF-87D8-E7658330C288}
- {857274AC-E741-4266-A7FD-14DEE0C1CC96} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+ {4A4711D8-4312-49FC-87B5-4F183F4C6A51} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{0724ED7C-56E3-4604-9970-25E600611383} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
+ {857274AC-E741-4266-A7FD-14DEE0C1CC96} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+ {60C33D0A-A5D8-4AB0-9956-1F804654DF05} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+ {A28BD8AC-DF15-4F58-8299-98A9AE2B8726} = {88278B81-7649-45DC-8A6A-D3A645C5AFC3}
EndGlobalSection
EndGlobal
diff --git a/README.md b/README.md
index 6bc696ff8..5f0ff2628 100644
--- a/README.md
+++ b/README.md
@@ -18,18 +18,18 @@ If you don't find your issue, please file one! However, given that this is a ver
Build Status
------------
-|Ubuntu 14.04 |Windows |Mac OS X |CentOS 7.1 |
-|:------:|:------:|:------:|:------:|
-||| | |
+|Ubuntu 14.04 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 |RHEL 7.2 |
+|:------:|:------:|:------:|:------:|:------:|:------:|
+|||| | | |
Installers
----------
-| |Ubuntu 14.04 |Windows |Mac OS X |CentOS 7.1 |
-|---------|:------:|:------:|:------:|:------:|
-|**Version**|||||
-|**Installers**|[Download Debian Package](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-ubuntu-x64.latest.deb)|[Download Msi](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-win-x64.latest.exe)|[Download Pkg](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-osx-x64.latest.pkg) |N/A |
-|**Binaries**|[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz)|[Download zip file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-win-x64.latest.zip)|[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-osx-x64.latest.tar.gz) |[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-centos-x64.latest.tar.gz) |
+| |Ubuntu 14.04 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 |RHEL 7.2 |
+|---------|:------:|:------:|:------:|:------:|:------:|:------:|
+|**Version**|||||||
+|**Installers**|[Download Debian Package](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-ubuntu-x64.latest.deb)|[Download Installer](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-win-x64.latest.exe)|[Download Installer](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-win-x86.latest.exe)|[Download Pkg](https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-osx-x64.latest.pkg) |N/A |N/A |
+|**Binaries**|[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-combined-framework-sdk-host-ubuntu-x64.latest.tar.gz)|[Download zip file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-combined-framework-sdk-host-win-x64.latest.zip)|[Download zip file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-combined-framework-sdk-host-win-x86.latest.zip)|[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-combined-framework-sdk-host-osx-x64.latest.tar.gz) |[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-combined-framework-sdk-host-centos-x64.latest.tar.gz)|[Download tar file](https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/Latest/dotnet-combined-framework-sdk-host-rhel-x64.latest.tar.gz) |
Interested in .NET Core + ASP.NET Core 1.0 RC1 bits?
----------------------------------------------------
diff --git a/TestAssets/FSharpTestProjects/CompileFail/project.json b/TestAssets/FSharpTestProjects/CompileFail/project.json
index 40621376b..84d87f6df 100644
--- a/TestAssets/FSharpTestProjects/CompileFail/project.json
+++ b/TestAssets/FSharpTestProjects/CompileFail/project.json
@@ -1,20 +1,19 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
- "compilerName": "fsc",
- "compileFiles": [
- "Program.fs"
- ],
- "dependencies": {
- "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "compilerName": "fsc",
+ "compileFiles": [
+ "Program.fs"
+ ],
+ "dependencies": {
+ "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/FSharpTestProjects/TestApp/project.json b/TestAssets/FSharpTestProjects/TestApp/project.json
index 141270ca8..90fcb92b9 100644
--- a/TestAssets/FSharpTestProjects/TestApp/project.json
+++ b/TestAssets/FSharpTestProjects/TestApp/project.json
@@ -1,21 +1,20 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
- "compilerName": "fsc",
- "compileFiles": [
- "Program.fs"
- ],
- "dependencies": {
- "TestLibrary": "1.0.0-*",
- "NETStandard.Library": "1.0.0-rc2-23901",
- "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "compilerName": "fsc",
+ "compileFiles": [
+ "Program.fs"
+ ],
+ "dependencies": {
+ "TestLibrary": "1.0.0-*",
+ "NETStandard.Library": "1.5.0-rc2-23911",
+ "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json b/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json
index 40621376b..84d87f6df 100644
--- a/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json
+++ b/TestAssets/FSharpTestProjects/TestAppWithArgs/project.json
@@ -1,20 +1,19 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
- "compilerName": "fsc",
- "compileFiles": [
- "Program.fs"
- ],
- "dependencies": {
- "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "compilerName": "fsc",
+ "compileFiles": [
+ "Program.fs"
+ ],
+ "dependencies": {
+ "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/FSharpTestProjects/TestLibrary/project.json b/TestAssets/FSharpTestProjects/TestLibrary/project.json
index 61961870b..0b29b1792 100644
--- a/TestAssets/FSharpTestProjects/TestLibrary/project.json
+++ b/TestAssets/FSharpTestProjects/TestLibrary/project.json
@@ -1,17 +1,17 @@
{
- "version": "1.0.0-*",
- "dependencies": {
- "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
- "compilerName": "fsc",
- "compileFiles": [
- "Helper2.fs",
- "Helper.fs"
- ],
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "dependencies": {
+ "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "compilerName": "fsc",
+ "compileFiles": [
+ "Helper2.fs",
+ "Helper.fs"
+ ],
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json
index d183d244f..7ce8666ac 100644
--- a/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json
+++ b/TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json
@@ -1,11 +1,11 @@
{
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901",
- "EmptyLibrary": "1.0.0-*"
- },
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911",
+ "EmptyLibrary": "1.0.0-*"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json
index 38a3ba296..a81519a70 100644
--- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json
+++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json
@@ -1,12 +1,12 @@
{
- "dependencies": { },
+ "dependencies": {},
"frameworks": {
"netstandardapp1.5": {
"imports": "dnxcore50",
"dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
+ "NETStandard.Library": "1.5.0-rc2-23911"
}
},
- "dnx451": { }
+ "dnx451": {}
}
}
diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json
index 667685804..17c4e9e46 100644
--- a/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json
+++ b/TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json
@@ -1,11 +1,11 @@
{
"version": "1.0.0-*",
- "dependencies": { },
+ "dependencies": {},
"frameworks": {
"netstandard1.3": {
"imports": "dnxcore50",
"dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
+ "NETStandard.Library": "1.5.0-rc2-23911"
}
}
}
diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json
index 505047ad2..83b5d4335 100644
--- a/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json
+++ b/TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json
@@ -3,9 +3,9 @@
"netstandardapp1.5": {
"imports": "dnxcore50",
"dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
+ "NETStandard.Library": "1.5.0-rc2-23911"
}
}
},
- "dependencies": { }
+ "dependencies": {}
}
diff --git a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json
index 58af503dc..37a82e632 100644
--- a/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json
+++ b/TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json
@@ -1,11 +1,11 @@
{
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901",
- "Microsoft.Web.Administration": "7.0.0"
- },
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911",
+ "Microsoft.Web.Administration": "7.0.0"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json
index 8c87d36c9..bb3a9cebf 100755
--- a/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json
+++ b/TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json
@@ -1,14 +1,12 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23811"
- },
-
- "frameworks": {
- "dnxcore50": { }
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "dnxcore50": {}
+ }
}
diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
index ea118a24d..cafaf976b 100644
--- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
+++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
@@ -1,16 +1,14 @@
{
- "version": "1.0.0",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json
index 464f94681..c1bd9c205 100644
--- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json
+++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json
@@ -1,16 +1,14 @@
{
- "version": "2.0.0",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "2.0.0",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestPackages/dotnet-portable/Program.cs b/TestAssets/TestPackages/dotnet-portable/Program.cs
new file mode 100644
index 000000000..58d61b1bc
--- /dev/null
+++ b/TestAssets/TestPackages/dotnet-portable/Program.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace ConsoleApplication
+{
+ public class Program
+ {
+ public static void Main(string[] args)
+ {
+ Console.WriteLine("Hello Portable World!");
+ }
+ }
+}
diff --git a/TestAssets/TestPackages/dotnet-portable/project.json b/TestAssets/TestPackages/dotnet-portable/project.json
new file mode 100644
index 000000000..0f9d20ba9
--- /dev/null
+++ b/TestAssets/TestPackages/dotnet-portable/project.json
@@ -0,0 +1,18 @@
+{
+ "version": "1.0.0",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+
+ "frameworks": {
+ "netstandard1.5": {
+ "imports": [
+ "dnxcore50",
+ "portable-net45+win8"
+ ],
+ "dependencies": {
+ "Microsoft.NETCore.App": "1.0.0-rc2-23911"
+ }
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json
index 679acc364..c888180eb 100644
--- a/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json
+++ b/TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json
@@ -1,23 +1,25 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901",
- "dotnet-hello": { "version": "1.0.0", "target": "package" }
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
- },
-
- "testRunner": "must-be-specified-to-generate-deps",
-
- "tools": {
- "dotnet-hello": { "version": "2.0.0", "target": "package" }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911",
+ "dotnet-hello": {
+ "version": "1.0.0",
+ "target": "package"
}
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
+ }
+ },
+ "testRunner": "must-be-specified-to-generate-deps",
+ "tools": {
+ "dotnet-portable": {
+ "version": "1.0.0",
+ "target": "package"
+ }
+ }
}
diff --git a/TestAssets/TestProjects/AppWithDirectDependency/project.json b/TestAssets/TestProjects/AppWithDirectDependency/project.json
index 2ce5cf482..14cc1022a 100644
--- a/TestAssets/TestProjects/AppWithDirectDependency/project.json
+++ b/TestAssets/TestProjects/AppWithDirectDependency/project.json
@@ -1,19 +1,19 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "testRunner": "must-be-specified-to-generate-deps",
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901",
- "dotnet-hello": {"version": "1.0.0", "target": "package"}
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "testRunner": "must-be-specified-to-generate-deps",
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911",
+ "dotnet-hello": {
+ "version": "1.0.0",
+ "target": "package"
}
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
+ }
+ }
}
diff --git a/TestAssets/TestProjects/AppWithToolDependency/project.json b/TestAssets/TestProjects/AppWithToolDependency/project.json
index 9537feb8f..b25c0b2a3 100644
--- a/TestAssets/TestProjects/AppWithToolDependency/project.json
+++ b/TestAssets/TestProjects/AppWithToolDependency/project.json
@@ -1,20 +1,20 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
- },
-
- "tools": {
- "dotnet-hello": { "version": "2.0.0", "target": "package" }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ },
+ "tools": {
+ "dotnet-portable": {
+ "version": "1.0.0",
+ "target": "package"
+ }
+ }
}
diff --git a/TestAssets/TestProjects/BuildTestPortableProject/Lib.cs b/TestAssets/TestProjects/BuildTestPortableProject/Lib.cs
deleted file mode 100644
index 2ac94ca9d..000000000
--- a/TestAssets/TestProjects/BuildTestPortableProject/Lib.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-public static class Thingy
-{
-}
diff --git a/TestAssets/TestProjects/BuildTestPortableProject/project.json b/TestAssets/TestProjects/BuildTestPortableProject/project.json
deleted file mode 100644
index 841c77d4d..000000000
--- a/TestAssets/TestProjects/BuildTestPortableProject/project.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "dependencies": {
- },
- "frameworks": {
- "netstandardapp1.5": {
- "imports": [
- "dnxcore50",
- "portable-net45+win8"
- ],
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- }
- }
- }
-}
diff --git a/TestAssets/TestProjects/BuildTestStandaloneProject/Lib.cs b/TestAssets/TestProjects/BuildTestStandaloneProject/Lib.cs
deleted file mode 100644
index 2ac94ca9d..000000000
--- a/TestAssets/TestProjects/BuildTestStandaloneProject/Lib.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-public static class Thingy
-{
-}
diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json
index c02d0dffe..2e5ebbe30 100644
--- a/TestAssets/TestProjects/CompileFail/project.json
+++ b/TestAssets/TestProjects/CompileFail/project.json
@@ -1,16 +1,14 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json
index 90a5334e8..00cd67349 100644
--- a/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json
+++ b/TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json
@@ -1,16 +1,15 @@
{
- "version": "1.0.0-*",
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901",
- "Microsoft.Extensions.DependencyModel": {
- "target": "project",
- "version": "1.0.0-*"
- }
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911",
+ "Microsoft.Extensions.DependencyModel": {
+ "target": "project",
+ "version": "1.0.0-*"
}
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
+ }
+ }
}
diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json
index 4c2908690..965a3f06e 100644
--- a/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json
+++ b/TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json
@@ -1,18 +1,16 @@
-{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true,
- "preserveCompilationContext": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901",
- "DependencyContextValidator": "1.0.0-*"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+{
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true,
+ "preserveCompilationContext": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911",
+ "DependencyContextValidator": "1.0.0-*"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json
index 9f1f402f6..f41c7127f 100644
--- a/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json
+++ b/TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json
@@ -1,17 +1,15 @@
-{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901",
- "DependencyContextValidator": "1.0.0-*"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+{
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911",
+ "DependencyContextValidator": "1.0.0-*"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json
index c02d0dffe..2e5ebbe30 100644
--- a/TestAssets/TestProjects/OutputStandardOutputAndError/project.json
+++ b/TestAssets/TestProjects/OutputStandardOutputAndError/project.json
@@ -1,16 +1,14 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/.noautobuild b/TestAssets/TestProjects/PortableTests/PortableApp/.noautobuild
new file mode 100644
index 000000000..e69de29bb
diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/Program.cs b/TestAssets/TestProjects/PortableTests/PortableApp/Program.cs
new file mode 100644
index 000000000..fbe8e9b0e
--- /dev/null
+++ b/TestAssets/TestProjects/PortableTests/PortableApp/Program.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace PortableApp
+{
+ public static class Program
+ {
+ public static void Main(string[] args)
+ {
+ Console.WriteLine("Hello, World!");
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/PortableTests/PortableApp/project.json b/TestAssets/TestProjects/PortableTests/PortableApp/project.json
new file mode 100644
index 000000000..3111191ad
--- /dev/null
+++ b/TestAssets/TestProjects/PortableTests/PortableApp/project.json
@@ -0,0 +1,17 @@
+{
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {},
+ "frameworks": {
+ "netstandard1.5": {
+ "imports": [
+ "dnxcore50",
+ "portable-net45+win8"
+ ],
+ "dependencies": {
+ "Microsoft.NETCore.App": "1.0.0-rc2-23911"
+ }
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/.noautobuild b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/.noautobuild
new file mode 100644
index 000000000..e69de29bb
diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/Program.cs b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/Program.cs
new file mode 100644
index 000000000..01b2c06d5
--- /dev/null
+++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/Program.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace PortableAppWithNative
+{
+ public static class Program
+ {
+ public static void Main(string[] args)
+ {
+ Console.WriteLine("Hello, World!");
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json
new file mode 100644
index 000000000..b315d44e7
--- /dev/null
+++ b/TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json
@@ -0,0 +1,14 @@
+{
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "frameworks": {
+ "netstandard1.5": {
+ "imports": [ "dnxcore50", "portable-net45+win8" ],
+ "dependencies": {
+ "Microsoft.NETCore.App": "1.0.0-rc2-23911",
+ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
+ }
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/.noautobuild b/TestAssets/TestProjects/PortableTests/StandaloneApp/.noautobuild
new file mode 100644
index 000000000..e69de29bb
diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/Program.cs b/TestAssets/TestProjects/PortableTests/StandaloneApp/Program.cs
new file mode 100644
index 000000000..529893b0e
--- /dev/null
+++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/Program.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace StandaloneApp
+{
+ public static class Program
+ {
+ public static void Main(string[] args)
+ {
+ Console.WriteLine("Hello, World!");
+ }
+ }
+}
diff --git a/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json
new file mode 100644
index 000000000..2cf04776c
--- /dev/null
+++ b/TestAssets/TestProjects/PortableTests/StandaloneApp/project.json
@@ -0,0 +1,26 @@
+{
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": [
+ "dnxcore50",
+ "portable-net45+win8"
+ ],
+ "dependencies": {
+ "Microsoft.NETCore.App": "1.0.0-rc2-23911"
+ }
+ }
+ },
+ "runtimes": {
+ "win7-x64": { },
+ "win7-x86": { },
+ "osx.10.10-x64": { },
+ "osx.10.11-x64": { },
+ "ubuntu.14.04-x64": { },
+ "centos.7-x64": { },
+ "rhel.7.2-x64": { },
+ "debian.8.2-x64": { }
+ }
+}
diff --git a/TestAssets/TestProjects/ProjectWithTests/GivenThatIWantSomeFakeTests.cs b/TestAssets/TestProjects/ProjectWithTests/GivenThatIWantSomeFakeTests.cs
new file mode 100644
index 000000000..4eca454af
--- /dev/null
+++ b/TestAssets/TestProjects/ProjectWithTests/GivenThatIWantSomeFakeTests.cs
@@ -0,0 +1,22 @@
+// 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 Xunit;
+
+namespace FakeTests
+{
+ public class GivenThatIWantSomeFakeTests
+ {
+ [Fact]
+ public void It_succeeds()
+ {
+ Assert.True(true);
+ }
+
+ [Fact]
+ public void It_fails()
+ {
+ Assert.True(false);
+ }
+ }
+}
\ No newline at end of file
diff --git a/TestAssets/TestProjects/ProjectWithTests/project.json b/TestAssets/TestProjects/ProjectWithTests/project.json
new file mode 100644
index 000000000..db7fc17fa
--- /dev/null
+++ b/TestAssets/TestProjects/ProjectWithTests/project.json
@@ -0,0 +1,21 @@
+{
+ "version": "1.0.0-*",
+
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911",
+
+ "xunit": "2.1.0",
+ "dotnet-test-xunit": "1.0.0-dev-91790-12"
+ },
+
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": [
+ "dnxcore50",
+ "portable-net45+win8"
+ ]
+ }
+ },
+
+ "testRunner": "xunit"
+}
diff --git a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json
index 5ed30dfa4..a081d6a7d 100644
--- a/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json
+++ b/TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json
@@ -1,16 +1,15 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50",
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ }
},
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50",
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- }
- },
- "net451": { }
- }
+ "net451": {}
+ }
}
diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json
index ded1b2439..6df0b0c6d 100644
--- a/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json
+++ b/TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json
@@ -1,19 +1,16 @@
-{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true,
- "preserveCompilationContext": true
- },
-
- "dependencies": {
- "TestLibrary": "1.0.0-*",
-
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+{
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true,
+ "preserveCompilationContext": true
+ },
+ "dependencies": {
+ "TestLibrary": "1.0.0-*",
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json
index dce6a0dad..f0b60ee88 100644
--- a/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json
+++ b/TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json
@@ -1,17 +1,20 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "nowarn": [ "CS1591" ],
- "xmlDoc": true,
- "additionalArguments": [ "-highentropyva+" ]
- },
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "nowarn": [
+ "CS1591"
+ ],
+ "xmlDoc": true,
+ "additionalArguments": [
+ "-highentropyva+"
+ ]
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json
index c02d0dffe..2e5ebbe30 100644
--- a/TestAssets/TestProjects/TestAppWithArgs/project.json
+++ b/TestAssets/TestProjects/TestAppWithArgs/project.json
@@ -1,16 +1,14 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestAppWithContentPackage/project.json b/TestAssets/TestProjects/TestAppWithContentPackage/project.json
index 43575128d..6e9d2a179 100644
--- a/TestAssets/TestProjects/TestAppWithContentPackage/project.json
+++ b/TestAssets/TestProjects/TestAppWithContentPackage/project.json
@@ -1,11 +1,10 @@
-{
+{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
-
"dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901",
+ "NETStandard.Library": "1.5.0-rc2-23911",
"SharedContentA": "1.0.0-*"
},
"frameworks": {
@@ -13,4 +12,4 @@
"imports": "dnxcore50"
}
}
-}
\ No newline at end of file
+}
diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json
index c149fddc2..e5f81bb6f 100644
--- a/TestAssets/TestProjects/TestAppWithContents/project.json
+++ b/TestAssets/TestProjects/TestAppWithContents/project.json
@@ -1,18 +1,15 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "content": "testcontentfile.txt",
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "content": "testcontentfile.txt",
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
index f9f77f358..88dd7cbee 100644
--- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
+++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
@@ -1,19 +1,19 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true,
- "preserveCompilationContext": true
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true,
+ "preserveCompilationContext": true
+ },
+ "dependencies": {
+ "TestLibrary": {
+ "target": "project",
+ "version": "1.0.0-*"
},
-
- "dependencies": {
- "TestLibrary": { "target":"project", "version":"1.0.0-*" },
-
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json
index 8e8b984b1..f0b60ee88 100644
--- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json
+++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json
@@ -1,17 +1,20 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "nowarn": [ "CS1591" ],
- "xmlDoc": true,
- "additionalArguments": [ "-highentropyva+" ]
- },
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23811"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "nowarn": [
+ "CS1591"
+ ],
+ "xmlDoc": true,
+ "additionalArguments": [
+ "-highentropyva+"
+ ]
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestAppWithScripts/project.json b/TestAssets/TestProjects/TestAppWithScripts/project.json
index 8de4803d7..11692199c 100644
--- a/TestAssets/TestProjects/TestAppWithScripts/project.json
+++ b/TestAssets/TestProjects/TestAppWithScripts/project.json
@@ -1,24 +1,21 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
- },
-
- "scripts": {
- "prepublish" : ["echoscript prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?"],
- "postpublish" : ["echoscript postpublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?"],
-
- "precompile" : ["echoscript precompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?"],
- "postcompile" : ["echoscript postcompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?"]
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ },
+ "scripts": {
+ "prepublish": [ "echoscript prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?" ],
+ "postpublish": [ "echoscript postpublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?" ],
+
+ "precompile": [ "echoscript precompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?" ],
+ "postcompile": [ "echoscript postcompile_output ?%compile:ProjectPath%? ?%compile:Configuration%? ?%compile:OutputPath%? ?%compile:TargetFramework%? ?%compile:Runtime%?" ]
+ }
}
diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json
index a1cb82f95..efafdef41 100644
--- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json
+++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json
@@ -1,24 +1,27 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true,
- "preserveCompilationContext": true
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true,
+ "preserveCompilationContext": true
+ },
+ "dependencies": {
+ "TestLibrary": {
+ "target": "project",
+ "version": "1.0.0-*"
},
-
- "dependencies": {
- "TestLibrary": { "target":"project", "version":"1.0.0-*" },
-
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
- },
-
- "scripts": {
- "prepublish" : ["echo prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:Framework%? ?%publish:Runtime%?"],
- "postpublish" : ["echo postpublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:Framework%? ?%publish:Runtime%?"]
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ },
+ "scripts": {
+ "prepublish": [
+ "echo prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:Framework%? ?%publish:Runtime%?"
+ ],
+ "postpublish": [
+ "echo postpublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:Framework%? ?%publish:Runtime%?"
+ ]
+ }
}
diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json
index dce6a0dad..f0b60ee88 100644
--- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json
+++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json
@@ -1,17 +1,20 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "nowarn": [ "CS1591" ],
- "xmlDoc": true,
- "additionalArguments": [ "-highentropyva+" ]
- },
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "nowarn": [
+ "CS1591"
+ ],
+ "xmlDoc": true,
+ "additionalArguments": [
+ "-highentropyva+"
+ ]
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json
index 06a4d2157..bc94bb833 100644
--- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json
+++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json
@@ -1,18 +1,18 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "TestLibraryWithAppDependency": {
+ "target": "project",
+ "version": "1.0.0-*"
},
-
- "dependencies": {
- "TestLibraryWithAppDependency": { "target":"project", "version":"1.0.0-*" },
-
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json
index 42c1b5f55..9b7ae73b7 100644
--- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json
+++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json
@@ -1,14 +1,15 @@
{
- "version": "1.0.0-*",
- "dependencies": {
- "TestApp": { "target":"project", "version":"1.0.0-*" },
-
- "NETStandard.Library": "1.0.0-rc2-23901"
+ "version": "1.0.0-*",
+ "dependencies": {
+ "TestApp": {
+ "target": "project",
+ "version": "1.0.0-*"
},
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json
index f9f77f358..88dd7cbee 100644
--- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json
+++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json
@@ -1,19 +1,19 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true,
- "preserveCompilationContext": true
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true,
+ "preserveCompilationContext": true
+ },
+ "dependencies": {
+ "TestLibrary": {
+ "target": "project",
+ "version": "1.0.0-*"
},
-
- "dependencies": {
- "TestLibrary": { "target":"project", "version":"1.0.0-*" },
-
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/README.md b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/README.md
new file mode 100644
index 000000000..add0a6729
--- /dev/null
+++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/README.md
@@ -0,0 +1,2 @@
+# What is this?
+This is a test wrapped project where we've checked in the binaries. To protect it from the build scripts cleaning the `bin` folder, we've renamed that folder to `bin.keep`. Please don't rename it!
\ No newline at end of file
diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/bin/Debug/dnxcore50/TestLibrary.dll b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/bin.keep/Debug/dnxcore50/TestLibrary.dll
similarity index 100%
rename from TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/bin/Debug/dnxcore50/TestLibrary.dll
rename to TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/bin.keep/Debug/dnxcore50/TestLibrary.dll
diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/bin/Debug/dnxcore50/TestLibrary.pdb b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/bin.keep/Debug/dnxcore50/TestLibrary.pdb
similarity index 100%
rename from TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/bin/Debug/dnxcore50/TestLibrary.pdb
rename to TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/bin.keep/Debug/dnxcore50/TestLibrary.pdb
diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/bin/Debug/dnxcore50/TestLibrary.xml b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/bin.keep/Debug/dnxcore50/TestLibrary.xml
similarity index 100%
rename from TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/bin/Debug/dnxcore50/TestLibrary.xml
rename to TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/bin.keep/Debug/dnxcore50/TestLibrary.xml
diff --git a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/project.json
index 5fb2b0c73..44ae2133b 100644
--- a/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/project.json
+++ b/TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/project.json
@@ -3,8 +3,8 @@
"netstandardapp1.5": {
"imports": "dnxcore50",
"bin": {
- "assembly": "bin\\{configuration}\\dnxcore50\\TestLibrary.dll",
- "pdb": "bin\\{configuration}\\dnxcore50\\TestLibrary.pdb"
+ "assembly": "bin.keep\\{configuration}\\dnxcore50\\TestLibrary.dll",
+ "pdb": "bin.keep\\{configuration}\\dnxcore50\\TestLibrary.pdb"
}
}
}
diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json
index 4b957d224..6254293c5 100644
--- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json
+++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json
@@ -1,20 +1,19 @@
-{
- "version": "1.0.0-*",
- "testRunner": "xunit",
- "dependencies": {
- "Newtonsoft.Json": "7.0.1"
- },
-
- "frameworks": {
- "net451": { },
- "netstandardapp1.5": {
- "imports": [
- "dnxcore50",
- "portable-net45+wp80+win8"
- ],
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- }
- }
+{
+ "version": "1.0.0-*",
+ "testRunner": "xunit",
+ "dependencies": {
+ "Newtonsoft.Json": "7.0.1"
+ },
+ "frameworks": {
+ "net451": {},
+ "netstandardapp1.5": {
+ "imports": [
+ "dnxcore50",
+ "portable-net45+wp80+win8"
+ ],
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ }
}
+ }
}
diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json
index 0cfc9606d..f1bb8120d 100644
--- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json
+++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json
@@ -1,21 +1,22 @@
{
- "version": "1.0.0-*",
- "testRunner": "xunit",
- "dependencies": {
- "Newtonsoft.Json": "6.0.0",
- "TestLibraryGreater": {"target":"project"}
- },
-
- "frameworks": {
- "net451": { },
- "netstandardapp1.5": {
- "imports": [
- "dnxcore50",
- "portable-net45+wp80+win8"
- ],
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- }
- }
+ "version": "1.0.0-*",
+ "testRunner": "xunit",
+ "dependencies": {
+ "Newtonsoft.Json": "6.0.0",
+ "TestLibraryGreater": {
+ "target": "project"
}
+ },
+ "frameworks": {
+ "net451": {},
+ "netstandardapp1.5": {
+ "imports": [
+ "dnxcore50",
+ "portable-net45+wp80+win8"
+ ],
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ }
+ }
+ }
}
diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json
index 126757ed1..930858382 100644
--- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json
+++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json
@@ -1,17 +1,18 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901",
- "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" }
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911",
+ "System.Runtime.Analyzers": {
+ "version": "1.1.0",
+ "type": "build"
}
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
+ }
+ }
}
diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json
index 731ac1d10..a4c57dce6 100644
--- a/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json
+++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/project.json
@@ -1,21 +1,23 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "nowarn": [ "CS1591" ],
- "xmlDoc": true,
- "additionalArguments": [ "-highentropyva+" ]
- },
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
- "configurations": {
- "Test": {
-
- }
- },
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "nowarn": [
+ "CS1591"
+ ],
+ "xmlDoc": true,
+ "additionalArguments": [
+ "-highentropyva+"
+ ]
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "configurations": {
+ "Test": {}
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json
index 391a5fc11..f12c8dafa 100644
--- a/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json
+++ b/TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json
@@ -1,21 +1,19 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": false
- },
-
- "dependencies": { },
-
- "frameworks": {
- "net20": { },
- "net35": { },
- "net40": { },
- "net461": { },
- "netstandardapp1.5": {
- "imports": "dnxcore50",
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- }
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": false
+ },
+ "dependencies": {},
+ "frameworks": {
+ "net20": {},
+ "net35": {},
+ "net40": {},
+ "net461": {},
+ "netstandardapp1.5": {
+ "imports": "dnxcore50",
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ }
}
+ }
}
diff --git a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json
index 8f97305eb..8d78b8ecc 100644
--- a/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json
+++ b/TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json
@@ -1,17 +1,17 @@
{
- "version": "1.0.0",
- "dependencies": { },
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50",
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- }
- },
- "dnx451": {
- "dependencies": {
- "Microsoft.CSharp": "4.0.1-*"
- }
- }
+ "version": "1.0.0",
+ "dependencies": {},
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50",
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ }
+ },
+ "dnx451": {
+ "dependencies": {
+ "Microsoft.CSharp": "4.0.1-rc2-23911"
+ }
}
-}
\ No newline at end of file
+ }
+}
diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json
index ef971a748..06f18fa20 100644
--- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json
+++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json
@@ -1,19 +1,16 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "L11": "1.0.0-*",
- "L12": "1.0.0-*",
-
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "L11": "1.0.0-*",
+ "L12": "1.0.0-*",
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json
index ed55b003b..ed65c4c04 100644
--- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json
+++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json
@@ -1,16 +1,13 @@
{
- "version": "1.0.0-*",
-
- "dependencies": {
- "L12": "1.0.0-*",
- "L21": "1.0.0-*",
-
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "dependencies": {
+ "L12": "1.0.0-*",
+ "L21": "1.0.0-*",
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json
index ac03a9cf7..e9486914f 100644
--- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json
+++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json
@@ -1,15 +1,12 @@
{
- "version": "1.0.0-*",
-
- "dependencies": {
- "L22": "1.0.0-*",
-
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "dependencies": {
+ "L22": "1.0.0-*",
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json
index 8af014e51..155cb2f02 100644
--- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json
+++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json
@@ -1,13 +1,11 @@
{
- "version": "1.0.0-*",
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json
index 8af014e51..155cb2f02 100644
--- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json
+++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json
@@ -1,13 +1,11 @@
{
- "version": "1.0.0-*",
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json
index c02d0dffe..2e5ebbe30 100644
--- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json
+++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json
@@ -1,16 +1,14 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json
index c02d0dffe..2e5ebbe30 100644
--- a/TestAssets/TestProjects/TestProjectWithResource/project.json
+++ b/TestAssets/TestProjects/TestProjectWithResource/project.json
@@ -1,16 +1,14 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json
index 3605210ec..7c888a5ad 100644
--- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json
+++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json
@@ -1,17 +1,15 @@
{
- "version": "1.0.0-*",
- "compilationOptions": {
- "emitEntryPoint": true,
- "xmlDoc": true
- },
-
- "dependencies": {
- "NETStandard.Library": "1.0.0-rc2-23901"
- },
-
- "frameworks": {
- "netstandardapp1.5": {
- "imports": "dnxcore50"
- }
+ "version": "1.0.0-*",
+ "compilationOptions": {
+ "emitEntryPoint": true,
+ "xmlDoc": true
+ },
+ "dependencies": {
+ "NETStandard.Library": "1.5.0-rc2-23911"
+ },
+ "frameworks": {
+ "netstandardapp1.5": {
+ "imports": "dnxcore50"
}
+ }
}
diff --git a/netci.groovy b/netci.groovy
index 0ff8b01e2..695a2c264 100644
--- a/netci.groovy
+++ b/netci.groovy
@@ -7,61 +7,56 @@ import jobs.generation.Utilities;
def project = GithubProject
def branch = GithubBranchName
+def isPR = true
-def osList = ['Ubuntu', 'OSX', 'Windows_NT', 'Windows_2016', 'CentOS7.1']
+def platformList = ['Ubuntu:x64:Debug', 'Ubuntu:x64:Release', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_2016:x64:Release', 'Windows_2016:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug']
-def static getBuildJobName(def configuration, def os) {
- return configuration.toLowerCase() + '_' + os.toLowerCase()
+def static getBuildJobName(def configuration, def os, def architecture) {
+ return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase()
}
-[true, false].each { isPR ->
- ['Debug', 'Release'].each { configuration ->
- osList.each { os ->
- // Calculate names
- def lowerConfiguration = configuration.toLowerCase()
- // Calculate job name
- def jobName = getBuildJobName(configuration, os)
- def buildCommand = '';
+platformList.each { platform ->
+ // Calculate names
+ def (os, architecture, configuration) = platform.tokenize(':')
- // Calculate the build command
- if (os == 'Windows_NT') {
- buildCommand = ".\\build.cmd -Configuration ${lowerConfiguration} -Targets Default"
- }
- else if (os == 'Windows_2016') {
- buildCommand = ".\\build.cmd -Configuration ${lowerConfiguration} -RunInstallerTestsInDocker -Targets Default"
- }
- else if (os == 'Ubuntu') {
- buildCommand = "./build.sh --skip-prereqs --configuration ${lowerConfiguration} --docker ubuntu --targets Default"
+ // Calculate job name
+ def jobName = getBuildJobName(configuration, os, architecture)
+ def buildCommand = '';
+
+ // Calculate the build command
+ if (os == 'Windows_NT') {
+ buildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -Targets Default"
+ }
+ else if (os == 'Windows_2016') {
+ buildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -RunInstallerTestsInDocker -Targets Default"
+ }
+ else if (os == 'Ubuntu') {
+ buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu --targets Default"
+ }
+ else {
+ // Jenkins non-Ubuntu CI machines don't have docker
+ buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default"
+ }
+
+ def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
+ // Set the label.
+ steps {
+ if (os == 'Windows_NT' || os == 'Windows_2016') {
+ // Batch
+ batchFile(buildCommand)
}
else {
- // Jenkins non-Ubuntu CI machines don't have docker
- buildCommand = "./build.sh --skip-prereqs --configuration ${lowerConfiguration} --targets Default"
- }
-
- def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
- // Set the label.
- steps {
- if (os == 'Windows_NT' || os == 'Windows_2016') {
- // Batch
- batchFile(buildCommand)
- }
- else {
- // Shell
- shell(buildCommand)
- }
- }
- }
-
- Utilities.setMachineAffinity(newJob, os, 'latest-or-auto')
- Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
- Utilities.addXUnitDotNETResults(newJob, '**/*-testResults.xml')
- if (isPR) {
- Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${configuration} Build")
- }
- else {
- Utilities.addGithubPushTrigger(newJob)
+ // Shell
+ shell(buildCommand)
}
}
}
+
+ Utilities.setMachineAffinity(newJob, os, 'latest-or-auto')
+ Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
+ Utilities.addXUnitDotNETResults(newJob, '**/*-testResults.xml')
+ Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build")
}
+
+
diff --git a/packaging/host/debian/dotnet-sharedhost-debian_config.json b/packaging/host/debian/dotnet-sharedhost-debian_config.json
new file mode 100644
index 000000000..840e5945f
--- /dev/null
+++ b/packaging/host/debian/dotnet-sharedhost-debian_config.json
@@ -0,0 +1,35 @@
+{
+ "maintainer_name":"Microsoft",
+ "maintainer_email": "dotnetcore@microsoft.com",
+
+ "package_name": "dotnet-host",
+ "install_root": "/usr/share/dotnet",
+
+ "short_description": ".NET Core Shared Host",
+ "long_description": ".NET Core is a cross-platform implementation of .NET Framework, a modern, modular platform\n for building diverse kinds of applications, from command-line applications to microservices and \n modern websites.\n This package contains the host that launches a .NET Core application.",
+ "homepage": "https://dotnet.github.io/core",
+
+ "release":{
+ "package_version":"1.0.0.0",
+ "package_revision":"1",
+ "urgency" : "low",
+ "changelog_message" : "Inital shared host."
+ },
+
+ "control": {
+ "priority":"standard",
+ "section":"libs",
+ "architecture":"amd64"
+ },
+
+ "copyright": "2015 Microsoft",
+ "license": {
+ "type": "MIT",
+ "full_text": "Copyright (c) 2015 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
+ },
+
+ "debian_dependencies":{
+ "libssl-dev" : {},
+ "libcurl3" : {}
+ }
+}
diff --git a/packaging/host/windows/generatemsi.ps1 b/packaging/host/windows/generatemsi.ps1
new file mode 100644
index 000000000..124a987e8
--- /dev/null
+++ b/packaging/host/windows/generatemsi.ps1
@@ -0,0 +1,109 @@
+# 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.
+
+param(
+ [Parameter(Mandatory=$true)][string]$SharedHostPublishRoot,
+ [Parameter(Mandatory=$true)][string]$DotnetHostMSIOutput,
+ [Parameter(Mandatory=$true)][string]$WixRoot,
+ [Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
+ [Parameter(Mandatory=$true)][string]$DotnetCLIVersion,
+ [Parameter(Mandatory=$true)][string]$Architecture,
+ [Parameter(Mandatory=$true)][string]$WixObjRoot
+)
+
+. "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
+$RepoRoot = Convert-Path "$PSScriptRoot\..\..\.."
+
+function RunCandle
+{
+ $result = $true
+ pushd "$WixRoot"
+
+ Write-Host Running candle..
+ $AuthWsxRoot = Join-Path $RepoRoot "packaging\host\windows"
+
+ .\candle.exe -nologo `
+ -out "$WixObjRoot\" `
+ -ext WixDependencyExtension.dll `
+ -dHostSrc="$SharedHostPublishRoot" `
+ -dMicrosoftEula="$RepoRoot\packaging\osx\resources\en.lproj\eula.rtf" `
+ -dBuildVersion="$DotnetMSIVersion" `
+ -dDisplayVersion="$DotnetCLIVersion" `
+ -arch $Architecture `
+ "$AuthWsxRoot\host.wxs" `
+ "$AuthWsxRoot\provider.wxs" `
+ "$AuthWsxRoot\registrykeys.wxs" | Out-Host
+
+ if($LastExitCode -ne 0)
+ {
+ $result = $false
+ Write-Host "Candle failed with exit code $LastExitCode."
+ }
+
+ popd
+ return $result
+}
+
+function RunLight
+{
+ $result = $true
+ pushd "$WixRoot"
+
+ Write-Host Running light..
+
+ .\light.exe -nologo `
+ -ext WixUIExtension.dll `
+ -ext WixDependencyExtension.dll `
+ -ext WixUtilExtension.dll `
+ -cultures:en-us `
+ "$WixObjRoot\host.wixobj" `
+ "$WixObjRoot\provider.wixobj" `
+ "$WixObjRoot\registrykeys.wixobj" `
+ -out $DotnetHostMSIOutput | Out-Host
+
+ if($LastExitCode -ne 0)
+ {
+ $result = $false
+ Write-Host "Light failed with exit code $LastExitCode."
+ }
+
+ popd
+ return $result
+}
+
+if(!(Test-Path $SharedHostPublishRoot))
+{
+ throw "$SharedHostPublishRoot not found"
+}
+
+if(!(Test-Path $WixObjRoot))
+{
+ throw "$WixObjRoot not found"
+}
+
+Write-Host "Creating shared host MSI at $DotnetHostMSIOutput"
+
+if([string]::IsNullOrEmpty($WixRoot))
+{
+ Exit -1
+}
+
+if(-Not (RunCandle))
+{
+ Exit -1
+}
+
+if(-Not (RunLight))
+{
+ Exit -1
+}
+
+if(!(Test-Path $DotnetHostMSIOutput))
+{
+ throw "Unable to create the shared host msi."
+ Exit -1
+}
+
+Write-Host -ForegroundColor Green "Successfully created shared host MSI - $DotnetHostMSIOutput"
+
+exit $LastExitCode
\ No newline at end of file
diff --git a/packaging/host/windows/host.wxs b/packaging/host/windows/host.wxs
new file mode 100644
index 000000000..a2bc03f95
--- /dev/null
+++ b/packaging/host/windows/host.wxs
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packaging/host/windows/provider.wxs b/packaging/host/windows/provider.wxs
new file mode 100644
index 000000000..be191eb7e
--- /dev/null
+++ b/packaging/host/windows/provider.wxs
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packaging/host/windows/registrykeys.wxs b/packaging/host/windows/registrykeys.wxs
new file mode 100644
index 000000000..3d971599b
--- /dev/null
+++ b/packaging/host/windows/registrykeys.wxs
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packaging/host/windows/variables.wxi b/packaging/host/windows/variables.wxi
new file mode 100644
index 000000000..71ea4a1d8
--- /dev/null
+++ b/packaging/host/windows/variables.wxi
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packaging/osx/Distribution-Template b/packaging/osx/Distribution-Template
deleted file mode 100644
index c220fa5ac..000000000
--- a/packaging/osx/Distribution-Template
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- .NET CLI {VERSION}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- dotnet-osx-x64.{VERSION}.pkg
-
diff --git a/packaging/osx/clisdk/Distribution-Template b/packaging/osx/clisdk/Distribution-Template
new file mode 100644
index 000000000..7e3f3b7ad
--- /dev/null
+++ b/packaging/osx/clisdk/Distribution-Template
@@ -0,0 +1,33 @@
+
+
+ .NET CLI {VERSION}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ com.microsoft.dotnet.sharedframework.{SharedFrameworkNugetName}.{SharedFrameworkNugetVersion}.component.osx.x64.pkg
+ com.microsoft.dotnet.sharedhost.osx.x64.pkg
+ com.microsoft.dotnet.sdk.osx.x64.pkg
+
diff --git a/packaging/osx/scripts/postinstall b/packaging/osx/clisdk/scripts/postinstall
similarity index 86%
rename from packaging/osx/scripts/postinstall
rename to packaging/osx/clisdk/scripts/postinstall
index 0a649953a..428b79064 100755
--- a/packaging/osx/scripts/postinstall
+++ b/packaging/osx/clisdk/scripts/postinstall
@@ -12,7 +12,7 @@ INSTALL_DESTINATION=$2
chmod -R 755 $INSTALL_DESTINATION
# Add the installation bin directory to the system-wide paths
-echo $INSTALL_DESTINATION/bin | tee -a /etc/paths.d/dotnet
+echo $INSTALL_DESTINATION | tee -a /etc/paths.d/dotnet
exit 0
diff --git a/packaging/osx/package-osx.sh b/packaging/osx/package-osx.sh
deleted file mode 100755
index 819a7e1f6..000000000
--- a/packaging/osx/package-osx.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-SOURCE="${BASH_SOURCE[0]}"
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
- DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
- SOURCE="$(readlink "$SOURCE")"
- [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-done
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-help(){
- echo "Usage: $0 [--version ] [--input ] [--output