From 0d233cd9d0cfc1a4d903a963045ce21483e0ab4c Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 26 Sep 2017 18:13:03 -0700 Subject: [PATCH 01/23] Insert SDK 2.0.2-vspre-20170927-1 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0b028d79e..4f43825c2 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,7 +12,7 @@ - 2.0.2-vspre-20170921-5 + 2.0.2-vspre-20170927-1 $(CLI_NETSDK_Version) 4.4.0-preview3-4475 From 79077b5ea214e1bfe154dc96e8b85dd9ee9e0140 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Wed, 27 Sep 2017 09:52:43 -0700 Subject: [PATCH 02/23] MSBuild 15.4.8 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 4f43825c2..9d9ec4f9a 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.0.0 - 15.4.7 + 15.4.8 2.3.2-beta1-61921-05 2.3.0-pre-20170727-1 1.6.0-beta2-25304 From 9a2e87f0d9173cfae54fdceaae230fc6a72ebd9c Mon Sep 17 00:00:00 2001 From: Shyam-Gupta Date: Mon, 9 Oct 2017 17:46:08 +0530 Subject: [PATCH 03/23] Updated version of TestPlatform to 15.5.0-preview-20170923-02 refer commit: https://github.com/dotnet/cli/pull/7709/commits/fa876f5b90d853df78de1942e596346aeb0cfaa9 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5f02dd04b..1f120943b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -18,7 +18,7 @@ 4.4.0-preview3-4475 2.0.0-preview3-25514-04 2.0.0-rel-20170908-653 - 15.3.0-preview-20170628-02 + 15.5.0-preview-20170923-02 $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) From b5d9f6f3e62dd2134fb16f7988c4ef8f84cab10b Mon Sep 17 00:00:00 2001 From: Shyam-Gupta Date: Tue, 10 Oct 2017 16:50:09 +0530 Subject: [PATCH 04/23] Update DependencyVersions.props --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 1f120943b..1ce1131d0 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -18,7 +18,7 @@ 4.4.0-preview3-4475 2.0.0-preview3-25514-04 2.0.0-rel-20170908-653 - 15.5.0-preview-20170923-02 + 15.5.0-preview-20171009-10 $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) From a084153c1567330a17b21287a7bfebdd5eedfc3c Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Tue, 10 Oct 2017 15:08:33 -0700 Subject: [PATCH 05/23] Insert NuGet Build 4.5.0-preview1-4526 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5f02dd04b..880df4900 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -15,7 +15,7 @@ 2.0.1-servicing-20170926-1 $(CLI_NETSDK_Version) - 4.4.0-preview3-4475 + 4.5.0-preview1-4526 2.0.0-preview3-25514-04 2.0.0-rel-20170908-653 15.3.0-preview-20170628-02 From 6a116d4b94685374af7b457533de055af4f80efc Mon Sep 17 00:00:00 2001 From: Vijay Ramakrishnan Date: Tue, 10 Oct 2017 16:38:32 -0700 Subject: [PATCH 06/23] Updating the websdk version to 2.0.0-rel-20171010-665 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 5f02dd04b..9629ab151 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -17,7 +17,7 @@ 4.4.0-preview3-4475 2.0.0-preview3-25514-04 - 2.0.0-rel-20170908-653 + 2.0.0-rel-20171010-665 15.3.0-preview-20170628-02 $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) From 857c7e3e5612f246eff41239b61d6f5428b3fd40 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 10 Oct 2017 22:11:00 -0700 Subject: [PATCH 07/23] Update branch info to release/15.5 --- README.md | 62 +++++++++++++++++++++--------------------- build/BranchInfo.props | 4 +-- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index b7981d26c..e6d7174b4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Looking for V1 of the .NET Core tooling? If you are looking for the v1.0.1 release of the .NET Core tools (CLI, MSBuild and the new csproj), see https://dot.net/core. -> **Note:** the release/2.0.0 branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the +> **Note:** the release/15.5 branch of the CLI repo is based on an upcoming update of the SDK and is considered pre-release. For production-level usage, please use the > released version of the tools available at https://dot.net/core Found an issue? @@ -64,7 +64,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ > **Note:** Be aware that the following installers are the **latest bits**. If you > want to install the latest released versions, check out the [preceding section](#looking-for-v1-of-the-net-core-tooling). -| Platform | Latest Daily Build
*release/2.0.0*
[![][version-badge]][version] | +| Platform | Latest Daily Build
*release/15.5*
[![][version-badge]][version] | | -------- | :-------------------------------------: | | **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] | | **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] | @@ -80,7 +80,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ | **OpenSUSE 42.1** | tar.gz - See **Linux x64** | -| Latest Coherent Build2
*release/2.0.0* | +| Latest Coherent Build2
*release/15.5* | |:------:| | [![][coherent-version-badge]][coherent-version] | @@ -89,43 +89,43 @@ Reference notes: >

**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.* [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.version -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x64_Release_version_badge.svg -[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/latest.coherent.version -[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/win_x86_Release_coherent_badge.svg +[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/latest.version +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/win_x64_Release_version_badge.svg +[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/latest.coherent.version +[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/win_x86_Release_coherent_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x64.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x64.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x64.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x64.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x64.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-win-x86.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x86.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x86.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x86.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-win-x86.zip.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-osx-x64.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-osx-x64.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-osx-x64.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-osx-x64.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-osx-x64.tar.gz.sha -[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz -[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-linux-x64.tar.gz.sha +[linux-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-linux-x64.tar.gz +[linux-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-linux-x64.tar.gz.sha -[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb -[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu-x64.deb.sha +[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu-x64.deb +[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu-x64.deb.sha -[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb -[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha +[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu.16.04-x64.deb +[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu.16.04-x64.deb.sha -[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb -[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha +[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu.16.10-x64.deb +[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha -[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb -[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb.sha +[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-debian-x64.deb +[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-debian-x64.deb.sha -[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm -[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm.sha +[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-rhel-x64.rpm +[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/15.5/dotnet-sdk-latest-rhel-x64.rpm.sha # Debian daily feed diff --git a/build/BranchInfo.props b/build/BranchInfo.props index 0d146ab2a..f048a677e 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -1,6 +1,6 @@ - release/2.0.0 - release/2.0.0 + release/15.5 + release/15.5 From 273f4bc4a566b0e339d41274e9b159799e5dfd45 Mon Sep 17 00:00:00 2001 From: faahmad Date: Wed, 11 Oct 2017 12:21:59 +0530 Subject: [PATCH 08/23] Fixed tests --- ...tTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs | 4 ++-- .../GivenDotnetTestBuildsAndRunsTestfromCsproj.cs | 12 ++++++------ test/dotnet-vstest.Tests/VSTestTests.cs | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs index adfc7b0d4..0a6e2e0fd 100644 --- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs +++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs @@ -39,9 +39,9 @@ namespace Microsoft.DotNet.Cli.Test.Tests { result.StdOut .Should().Contain("Total tests: 3. Passed: 2. Failed: 1. Skipped: 0.", "because .NET 4.6 tests will pass") - .And.Contain("Passed TestNamespace.VSTestTests.VSTestPassTestDesktop", "because .NET 4.6 tests will pass") + .And.Contain("Passed VSTestPassTestDesktop", "because .NET 4.6 tests will pass") .And.Contain("Total tests: 3. Passed: 1. Failed: 2. Skipped: 0.", "because netcoreapp2.0 tests will fail") - .And.Contain("Failed TestNamespace.VSTestTests.VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail"); + .And.Contain("Failed VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail"); } result.ExitCode.Should().Be(1); } diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs index 807688463..050b547e1 100644 --- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs +++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs @@ -28,8 +28,8 @@ namespace Microsoft.DotNet.Cli.Test.Tests if (!DotnetUnderTest.IsLocalized()) { result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0."); - result.StdOut.Should().Contain("Passed TestNamespace.VSTestTests.VSTestPassTest"); - result.StdOut.Should().Contain("Failed TestNamespace.VSTestTests.VSTestFailTest"); + result.StdOut.Should().Contain("Passed VSTestPassTest"); + result.StdOut.Should().Contain("Failed VSTestFailTest"); } result.ExitCode.Should().Be(1); @@ -52,8 +52,8 @@ namespace Microsoft.DotNet.Cli.Test.Tests if (!DotnetUnderTest.IsLocalized()) { result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0."); - result.StdOut.Should().Contain("Passed TestNamespace.VSTestTests.VSTestPassTest"); - result.StdOut.Should().Contain("Failed TestNamespace.VSTestTests.VSTestFailTest"); + result.StdOut.Should().Contain("Passed VSTestPassTest"); + result.StdOut.Should().Contain("Failed VSTestFailTest"); } result.ExitCode.Should().Be(1); @@ -227,8 +227,8 @@ namespace Microsoft.DotNet.Cli.Test.Tests if (!DotnetUnderTest.IsLocalized()) { result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0."); - result.StdOut.Should().Contain("Passed TestNamespace.VSTestTests.VSTestPassTest"); - result.StdOut.Should().Contain("Failed TestNamespace.VSTestTests.VSTestFailTest"); + result.StdOut.Should().Contain("Passed VSTestPassTest"); + result.StdOut.Should().Contain("Failed VSTestFailTest"); } result.ExitCode.Should().Be(1); diff --git a/test/dotnet-vstest.Tests/VSTestTests.cs b/test/dotnet-vstest.Tests/VSTestTests.cs index 47eae7e89..d1de1e8e8 100644 --- a/test/dotnet-vstest.Tests/VSTestTests.cs +++ b/test/dotnet-vstest.Tests/VSTestTests.cs @@ -42,8 +42,8 @@ namespace Microsoft.DotNet.Cli.VSTest.Tests { result.StdOut .Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.") - .And.Contain("Passed TestNamespace.VSTestTests.VSTestPassTest") - .And.Contain("Failed TestNamespace.VSTestTests.VSTestFailTest"); + .And.Contain("Passed VSTestPassTest") + .And.Contain("Failed VSTestFailTest"); } result.ExitCode.Should().Be(1); From 903001c51c7bca5f37d340778e7a60611df13cb2 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 11 Oct 2017 10:25:55 -0700 Subject: [PATCH 09/23] 'NuGet.master.config' does not appear to be used. --- NuGet.master.config | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 NuGet.master.config diff --git a/NuGet.master.config b/NuGet.master.config deleted file mode 100644 index b004e5cc7..000000000 --- a/NuGet.master.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file From 282de2bfe2d31d2a1aa2e8cc99115c8fe929ae8c Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 11 Oct 2017 10:53:53 -0700 Subject: [PATCH 10/23] Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0 --- scripts/obtain/dotnet-install.sh | 171 ++++++++++++++++--------------- 1 file changed, 86 insertions(+), 85 deletions(-) diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index a3a7b6ed8..1db273f24 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -240,7 +240,7 @@ to_lowercase() { remove_trailing_slash() { #eval $invocation - local input=${1:-} + local input="${1:-}" echo "${input%/}" return 0 } @@ -250,7 +250,7 @@ remove_trailing_slash() { remove_beginning_slash() { #eval $invocation - local input=${1:-} + local input="${1:-}" echo "${input#/}" return 0 } @@ -267,8 +267,8 @@ combine_paths() { return 1 fi - local root_path=$(remove_trailing_slash $1) - local child_path=$(remove_beginning_slash ${2:-}) + local root_path="$(remove_trailing_slash "$1")" + local child_path="$(remove_beginning_slash "${2:-}")" say_verbose "combine_paths: root_path=$root_path" say_verbose "combine_paths: child_path=$child_path" echo "$root_path/$child_path" @@ -288,10 +288,10 @@ get_machine_architecture() { get_normalized_architecture_from_architecture() { eval $invocation - local architecture=$(to_lowercase $1) - case $architecture in + local architecture="$(to_lowercase "$1")" + case "$architecture" in \) - echo "$(get_normalized_architecture_from_architecture $(get_machine_architecture))" + echo "$(get_normalized_architecture_from_architecture "$(get_machine_architecture)")" return 0 ;; amd64|x64) @@ -338,11 +338,11 @@ get_commit_hash_from_version_info() { is_dotnet_package_installed() { eval $invocation - local install_root=$1 - local relative_path_to_package=$2 - local specific_version=${3//[$'\t\r\n']} + local install_root="$1" + local relative_path_to_package="$2" + local specific_version="${3//[$'\t\r\n']}" - local dotnet_package_path=$(combine_paths $(combine_paths $install_root $relative_path_to_package) $specific_version) + local dotnet_package_path="$(combine_paths "$(combine_paths "$install_root" "$relative_path_to_package")" "$specific_version")" say_verbose "is_dotnet_package_installed: dotnet_package_path=$dotnet_package_path" if [ -d "$dotnet_package_path" ]; then @@ -360,10 +360,10 @@ is_dotnet_package_installed() { get_latest_version_info() { eval $invocation - local azure_feed=$1 - local channel=$2 - local normalized_architecture=$3 - local coherent=$4 + local azure_feed="$1" + local channel="$2" + local normalized_architecture="$3" + local coherent="$4" local version_file_url=null if [ "$shared_runtime" = true ]; then @@ -377,7 +377,7 @@ get_latest_version_info() { fi say_verbose "get_latest_version_info: latest url: $version_file_url" - download $version_file_url + download "$version_file_url" return $? } @@ -389,28 +389,28 @@ get_latest_version_info() { get_specific_version_from_version() { eval $invocation - local azure_feed=$1 - local channel=$2 - local normalized_architecture=$3 - local version=$(to_lowercase $4) + local azure_feed="$1" + local channel="$2" + local normalized_architecture="$3" + local version="$(to_lowercase "$4")" - case $version in + case "$version" in latest) local version_info - version_info="$(get_latest_version_info $azure_feed $channel $normalized_architecture false)" || return 1 + version_info="$(get_latest_version_info "$azure_feed" "$channel" "$normalized_architecture" false)" || return 1 say_verbose "get_specific_version_from_version: version_info=$version_info" echo "$version_info" | get_version_from_version_info return 0 ;; coherent) local version_info - version_info="$(get_latest_version_info $azure_feed $channel $normalized_architecture true)" || return 1 + version_info="$(get_latest_version_info "$azure_feed" "$channel" "$normalized_architecture" true)" || return 1 say_verbose "get_specific_version_from_version: version_info=$version_info" echo "$version_info" | get_version_from_version_info return 0 ;; *) - echo $version + echo "$version" return 0 ;; esac @@ -424,13 +424,13 @@ get_specific_version_from_version() { construct_download_link() { eval $invocation - local azure_feed=$1 - local channel=$2 - local normalized_architecture=$3 - local specific_version=${4//[$'\t\r\n']} + local azure_feed="$1" + local channel="$2" + local normalized_architecture="$3" + local specific_version="${4//[$'\t\r\n']}" local osname - osname=$(get_current_os_name) || return 1 + osname="$(get_current_os_name)" || return 1 local download_link=null if [ "$shared_runtime" = true ]; then @@ -451,13 +451,13 @@ construct_download_link() { construct_legacy_download_link() { eval $invocation - local azure_feed=$1 - local channel=$2 - local normalized_architecture=$3 - local specific_version=${4//[$'\t\r\n']} + local azure_feed="$1" + local channel="$2" + local normalized_architecture="$3" + local specific_version="${4//[$'\t\r\n']}" local distro_specific_osname - distro_specific_osname=$(get_distro_specific_os_name) || return 1 + distro_specific_osname="$(get_distro_specific_os_name)" || return 1 local legacy_download_link=null if [ "$shared_runtime" = true ]; then @@ -474,7 +474,7 @@ get_user_install_path() { eval $invocation if [ ! -z "${DOTNET_INSTALL_DIR:-}" ]; then - echo $DOTNET_INSTALL_DIR + echo "$DOTNET_INSTALL_DIR" else echo "$HOME/.dotnet" fi @@ -488,7 +488,7 @@ resolve_installation_path() { local install_dir=$1 if [ "$install_dir" = "" ]; then - local user_install_path=$(get_user_install_path) + local user_install_path="$(get_user_install_path)" say_verbose "resolve_installation_path: user_install_path=$user_install_path" echo "$user_install_path" return 0 @@ -503,11 +503,11 @@ resolve_installation_path() { get_installed_version_info() { eval $invocation - local install_root=$1 - local version_file=$(combine_paths "$install_root" "$local_version_file_relative_path") + local install_root="$1" + local version_file="$(combine_paths "$install_root" "$local_version_file_relative_path")" say_verbose "Local version file: $version_file" if [ ! -z "$version_file" ] | [ -r "$version_file" ]; then - local version_info="$(cat $version_file)" + local version_info="$(cat "$version_file")" echo "$version_info" return 0 fi @@ -522,7 +522,7 @@ get_absolute_path() { eval $invocation local relative_or_absolute_path=$1 - echo $(cd $(dirname "$1") && pwd -P)/$(basename "$1") + echo "$(cd "$(dirname "$1")" && pwd -P)/$(basename "$1")" return 0 } @@ -534,17 +534,17 @@ get_absolute_path() { copy_files_or_dirs_from_list() { eval $invocation - local root_path=$(remove_trailing_slash $1) - local out_path=$(remove_trailing_slash $2) - local override=$3 + local root_path="$(remove_trailing_slash "$1")" + local out_path="$(remove_trailing_slash "$2")" + local override="$3" local override_switch=$(if [ "$override" = false ]; then printf -- "-n"; fi) cat | uniq | while read -r file_path; do - local path=$(remove_beginning_slash ${file_path#$root_path}) - local target=$out_path/$path + local path="$(remove_beginning_slash "${file_path#$root_path}")" + local target="$out_path/$path" if [ "$override" = true ] || (! ([ -d "$target" ] || [ -e "$target" ])); then - mkdir -p $out_path/$(dirname $path) - cp -R $override_switch $root_path/$path $target + mkdir -p "$out_path/$(dirname "$path")" + cp -R $override_switch "$root_path/$path" "$target" fi done } @@ -555,19 +555,19 @@ copy_files_or_dirs_from_list() { extract_dotnet_package() { eval $invocation - local zip_path=$1 - local out_path=$2 + local zip_path="$1" + local out_path="$2" - local temp_out_path=$(mktemp -d $temporary_file_template) + local temp_out_path="$(mktemp -d "$temporary_file_template")" local failed=false tar -xzf "$zip_path" -C "$temp_out_path" > /dev/null || failed=true local folders_with_version_regex='^.*/[0-9]+\.[0-9]+[^/]+/' - find $temp_out_path -type f | grep -Eo $folders_with_version_regex | copy_files_or_dirs_from_list $temp_out_path $out_path false - find $temp_out_path -type f | grep -Ev $folders_with_version_regex | copy_files_or_dirs_from_list $temp_out_path $out_path $override_non_versioned_files + find "$temp_out_path" -type f | grep -Eo "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" false + find "$temp_out_path" -type f | grep -Ev "$folders_with_version_regex" | copy_files_or_dirs_from_list "$temp_out_path" "$out_path" "$override_non_versioned_files" - rm -rf $temp_out_path + rm -rf "$temp_out_path" if [ "$failed" = true ]; then say_err "Extraction failed" @@ -581,14 +581,14 @@ extract_dotnet_package() { download() { eval $invocation - local remote_path=$1 - local out_path=${2:-} + local remote_path="$1" + local out_path="${2:-}" local failed=false if machine_has "curl"; then - downloadcurl $remote_path $out_path || failed=true + downloadcurl "$remote_path" "$out_path" || failed=true elif machine_has "wget"; then - downloadwget $remote_path $out_path || failed=true + downloadwget "$remote_path" "$out_path" || failed=true else failed=true fi @@ -601,14 +601,14 @@ download() { downloadcurl() { eval $invocation - local remote_path=$1 - local out_path=${2:-} + local remote_path="$1" + local out_path="${2:-}" local failed=false if [ -z "$out_path" ]; then - curl --retry 10 -sSL -f --create-dirs $remote_path || failed=true + curl --retry 10 -sSL -f --create-dirs "$remote_path" || failed=true else - curl --retry 10 -sSL -f --create-dirs -o $out_path $remote_path || failed=true + curl --retry 10 -sSL -f --create-dirs -o "$out_path" "$remote_path" || failed=true fi if [ "$failed" = true ]; then say_verbose "Curl download failed" @@ -619,14 +619,14 @@ downloadcurl() { downloadwget() { eval $invocation - local remote_path=$1 - local out_path=${2:-} + local remote_path="$1" + local out_path="${2:-}" local failed=false if [ -z "$out_path" ]; then - wget -q --tries 10 -O - $remote_path || failed=true + wget -q --tries 10 -O - "$remote_path" || failed=true else - wget -v --tries 10 -O $out_path $remote_path || failed=true + wget -v --tries 10 -O "$out_path" "$remote_path" || failed=true fi if [ "$failed" = true ]; then say_verbose "Wget download failed" @@ -639,20 +639,20 @@ calculate_vars() { eval $invocation valid_legacy_download_link=true - normalized_architecture=$(get_normalized_architecture_from_architecture "$architecture") + normalized_architecture="$(get_normalized_architecture_from_architecture "$architecture")" say_verbose "normalized_architecture=$normalized_architecture" - specific_version=$(get_specific_version_from_version $azure_feed $channel $normalized_architecture $version) + specific_version="$(get_specific_version_from_version "$azure_feed" "$channel" "$normalized_architecture" "$version")" say_verbose "specific_version=$specific_version" if [ -z "$specific_version" ]; then say_err "Could not get version information." return 1 fi - download_link=$(construct_download_link $azure_feed $channel $normalized_architecture $specific_version) + download_link="$(construct_download_link "$azure_feed" "$channel" "$normalized_architecture" "$specific_version")" say_verbose "download_link=$download_link" - legacy_download_link=$(construct_legacy_download_link $azure_feed $channel $normalized_architecture $specific_version) || valid_legacy_download_link=false + legacy_download_link="$(construct_legacy_download_link "$azure_feed" "$channel" "$normalized_architecture" "$specific_version")" || valid_legacy_download_link=false if [ "$valid_legacy_download_link" = true ]; then say_verbose "legacy_download_link=$legacy_download_link" @@ -660,7 +660,7 @@ calculate_vars() { say_verbose "Cound not construct a legacy_download_link; omitting..." fi - install_root=$(resolve_installation_path $install_dir) + install_root="$(resolve_installation_path "$install_dir")" say_verbose "install_root=$install_root" } @@ -668,32 +668,33 @@ install_dotnet() { eval $invocation local download_failed=false - if is_dotnet_package_installed $install_root "sdk" $specific_version; then + if is_dotnet_package_installed "$install_root" "sdk" "$specific_version"; then say ".NET SDK version $specific_version is already installed." return 0 fi - mkdir -p $install_root - zip_path=$(mktemp $temporary_file_template) + mkdir -p "$install_root" + zip_path="$(mktemp "$temporary_file_template")" say_verbose "Zip path: $zip_path" say "Downloading link: $download_link" + # Failures are normal in the non-legacy case for ultimately legacy downloads. # Do not output to stderr, since output to stderr is considered an error. - download "$download_link" $zip_path 2>&1 || download_failed=true + download "$download_link" "$zip_path" 2>&1 || download_failed=true # if the download fails, download the legacy_download_link if [ "$download_failed" = true ] && [ "$valid_legacy_download_link" = true ]; then say "Cannot download: $download_link" - download_link=$legacy_download_link - zip_path=$(mktemp $temporary_file_template) + download_link="$legacy_download_link" + zip_path="$(mktemp "$temporary_file_template")" say_verbose "Legacy zip path: $zip_path" say "Downloading legacy link: $download_link" - download "$download_link" $zip_path + download "$download_link" "$zip_path" fi say "Extracting zip from $download_link" - extract_dotnet_package $zip_path $install_root + extract_dotnet_package "$zip_path" "$install_root" return 0 } @@ -717,11 +718,11 @@ override_non_versioned_files=true while [ $# -ne 0 ] do - name=$1 - case $name in + name="$1" + case "$name" in -c|--channel|-[Cc]hannel) shift - channel=$1 + channel="$1" ;; -v|--version|-[Vv]ersion) shift @@ -764,7 +765,7 @@ do override_non_versioned_files=false ;; -?|--?|-h|--help|-[Hh]elp) - script_name="$(basename $0)" + script_name="$(basename "$0")" echo ".NET Tools Installer" echo "Usage: $script_name [-c|--channel ] [-v|--version ] [-p|--prefix ]" echo " $script_name -h|-?|--help" @@ -830,17 +831,17 @@ if [ "$dry_run" = true ]; then if [ "$valid_legacy_download_link" = true ]; then say "Legacy payload URL: $legacy_download_link" fi - say "Repeatable invocation: ./$(basename $0) --version $specific_version --channel $channel --install-dir $install_dir" + say "Repeatable invocation: ./$(basename "$0") --version $specific_version --channel $channel --install-dir $install_dir" exit 0 fi check_pre_reqs install_dotnet -bin_path=$(get_absolute_path $(combine_paths $install_root $bin_folder_relative_path)) +bin_path="$(get_absolute_path "$(combine_paths "$install_root" "$bin_folder_relative_path")")" if [ "$no_path" = false ]; then say "Adding to current process PATH: \`$bin_path\`. Note: This change will be visible only when sourcing script." - export PATH=$bin_path:$PATH + export PATH="$bin_path":"$PATH" else say "Binaries of dotnet can be found in $bin_path" fi From c6139adcc96ad1ec9db4515360beb38c0280618d Mon Sep 17 00:00:00 2001 From: seancpeters Date: Wed, 11 Oct 2017 16:22:03 -0700 Subject: [PATCH 11/23] added a way to specify the asp.net template versions --- build/BundledTemplates.props | 10 ++++++++-- build/DependencyVersions.props | 7 ++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index 549508206..c0c286421 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -1,10 +1,16 @@ - - + + + + + + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 6cc04f3bd..83ae30c72 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -22,9 +22,10 @@ $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) - 1.0.0-beta2-20170810-304 - 1.0.0-beta2-20170810-304 - 1.0.0-beta2-20170810-304 + 1.0.0-beta2-20171004-309 + 1.0.0-beta2-20171004-309 + 1.0.0-beta2-20171004-309 + 1.0.0-beta2-20171004-309 2.0.0 2.0.0 0.1.1-alpha-167 From 2d6314e78f5c16ed65c98321fd1f1611339a560c Mon Sep 17 00:00:00 2001 From: seancpeters Date: Wed, 11 Oct 2017 16:37:49 -0700 Subject: [PATCH 12/23] removed commented out config I'd meant to remove --- build/BundledTemplates.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index c0c286421..76dd56562 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -9,8 +9,5 @@ - From 3b09db3f9eb4c23aa3811e04a557c7d78547eb29 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Wed, 11 Oct 2017 17:26:43 -0700 Subject: [PATCH 13/23] MSBuild 15.5.153 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 6cc04f3bd..f35479912 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.0.0 - 15.5.0-preview-000113-1032064 + 15.5.0-preview-000153-1054696 2.6.0-beta1-62126-01 2.6.0-pre-20171003-1 1.6.0-beta2-25304 From 97f4a01869e406221d2f14e7ecfe518dad3513f1 Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Wed, 11 Oct 2017 17:27:36 -0700 Subject: [PATCH 14/23] MSBuild 15.5.154 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 6cc04f3bd..9f955e997 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.0.0 - 15.5.0-preview-000113-1032064 + 15.5.0-preview-000154-1054573 2.6.0-beta1-62126-01 2.6.0-pre-20171003-1 1.6.0-beta2-25304 From d15d4483329bfa376f45b9d889ed4896f9a55a3f Mon Sep 17 00:00:00 2001 From: Andy Gerlicher Date: Wed, 11 Oct 2017 18:30:57 -0700 Subject: [PATCH 15/23] Update NuGet to 4529 (signed) --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 9f955e997..8d466e1fe 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -15,7 +15,7 @@ 2.0.1-servicing-20170926-1 $(CLI_NETSDK_Version) - 4.5.0-preview1-4526 + 4.5.0-preview2-4529 2.0.0-preview3-25514-04 2.0.0-rel-20171010-665 15.5.0-preview-20171009-10 From 15ee853d4945ed1c07b18a20d4b62738d1d8fe26 Mon Sep 17 00:00:00 2001 From: NuGet Team Bot Date: Wed, 11 Oct 2017 18:44:34 -0700 Subject: [PATCH 16/23] Insert NuGet Build 4.5.0-preview2-4529 into cli --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e183f7850..989e82616 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -15,7 +15,7 @@ 2.0.1-servicing-20170926-1 $(CLI_NETSDK_Version) - 4.5.0-preview1-4526 + 4.5.0-preview2-4529 2.0.0-preview3-25514-04 2.0.0-rel-20171010-665 15.5.0-preview-20171009-10 From 821a413dd6a3372e1dee5aa86b3c70579fb77658 Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 11 Oct 2017 22:29:40 -0700 Subject: [PATCH 17/23] Updating Roslyn satellites and SDK versions --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index e183f7850..4e4a6e385 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,7 +4,7 @@ 2.0.0 15.5.0-preview-000153-1054696 2.6.0-beta1-62126-01 - 2.6.0-pre-20171003-1 + 2.6.0-pre-20171012-1 1.6.0-beta2-25304 4.2.0-rtm-170926-0 4.4.1-pre-20171003-1 @@ -12,7 +12,7 @@ - 2.0.1-servicing-20170926-1 + 15.5.0-preview-20171012-6 $(CLI_NETSDK_Version) 4.5.0-preview1-4526 From 7b558111ae5d1eb8173288bc533dda1b319dc0ec Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Thu, 12 Oct 2017 16:17:27 -0700 Subject: [PATCH 18/23] Use same build number for roslyn and F# satellites --- build/DependencyVersions.props | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2d8fc4aee..d9ade5d20 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -4,10 +4,12 @@ 2.0.0 15.5.0-preview-000154-1054573 2.6.0-beta1-62126-01 - 2.6.0-pre-20171012-1 1.6.0-beta2-25304 4.2.0-rtm-170926-0 - 4.4.1-pre-20171003-1 + + pre-20171012-1 + 2.6.0-$(CLI_Deps_Satellites_Build) + 4.4.1-$(CLI_Deps_Satellites_Build) - + + All + @@ -74,9 +72,33 @@ - + + + + + + + + + + + + + + "version": ".*" + "version": "$(CLI_SharedFrameworkVersion)" + + + + + + + + + - + + - + - + - - + + + + + + + + - + + + + + + + + + + - - - - - + + + + + - - diff --git a/src/tool_roslyn/RunCsc.cmd b/src/tool_roslyn/RunCsc.cmd deleted file mode 100644 index 7398082b2..000000000 --- a/src/tool_roslyn/RunCsc.cmd +++ /dev/null @@ -1,6 +0,0 @@ -@echo off - -REM Copyright (c) .NET Foundation and contributors. All rights reserved. -REM Licensed under the MIT license. See LICENSE file in the project root for full license information. - -"%~dp0..\..\..\dotnet" "%~dp0csc.exe" %* diff --git a/src/tool_roslyn/RunCsc.sh b/src/tool_roslyn/RunCsc.sh deleted file mode 100755 index 47aed63d1..000000000 --- a/src/tool_roslyn/RunCsc.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env 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. -# - -set -e - -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 )" - -"$DIR/../../../dotnet" "$DIR/csc.exe" "$@" diff --git a/src/tool_roslyn/RunVbc.cmd b/src/tool_roslyn/RunVbc.cmd deleted file mode 100644 index e891b1bf5..000000000 --- a/src/tool_roslyn/RunVbc.cmd +++ /dev/null @@ -1,6 +0,0 @@ -@echo off - -REM Copyright (c) .NET Foundation and contributors. All rights reserved. -REM Licensed under the MIT license. See LICENSE file in the project root for full license information. - -"%~dp0..\..\..\dotnet" "%~dp0vbc.exe" %* diff --git a/src/tool_roslyn/RunVbc.sh b/src/tool_roslyn/RunVbc.sh deleted file mode 100755 index 3dda886a0..000000000 --- a/src/tool_roslyn/RunVbc.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env 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. -# - -set -e - -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 )" - -"$DIR/../../../dotnet" "$DIR/vbc.exe" "$@" diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj deleted file mode 100644 index bd702ca7c..000000000 --- a/src/tool_roslyn/tool_roslyn.csproj +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - $(CliVersionPrefix) - netcoreapp2.0 - $(CLI_SharedFrameworkVersion) - true - $(RoslynDirectory) - $(CommitCount) - - - - - - - - - - - - - - PreserveNewest - PreserveNewest - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj b/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj new file mode 100644 index 000000000..d42c632b0 --- /dev/null +++ b/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj @@ -0,0 +1,35 @@ + + + + + + $(CliVersionPrefix) + $(CliTargetFramework) + $(CLI_SharedFrameworkVersion) + $(RoslynDirectory)/bincore + $(CommitCount) + false + false + false + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs b/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs index 4450258ee..a40e23b5a 100644 --- a/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs +++ b/test/dotnet-msbuild.Tests/GivenMsbuildForwardingApp.cs @@ -31,8 +31,6 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests [Theory] [InlineData("MSBuildExtensionsPath")] - [InlineData("CscToolExe")] - [InlineData("VbcToolExe")] [InlineData("MSBuildSDKsPath")] [InlineData("DOTNET_CLI_TELEMETRY_SESSIONID")] public void ItSetsEnvironmentalVariables(string envVarName) @@ -66,28 +64,6 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests .Exist(); } - [Fact] - public void ItSetsCscToolExePathToValidPath() - { - var msbuildPath = ""; - var envVar = "CscToolExe"; - new FileInfo(new MSBuildForwardingApp(new string[0], msbuildPath) - .GetProcessStartInfo() - .Environment[envVar]) - .Should().NotBeNull("constructor will throw on invalid path"); - } - - [Fact] - public void ItSetsVbcToolExePathToValidPath() - { - var msbuildPath = ""; - var envVar = "VbcToolExe"; - new FileInfo(new MSBuildForwardingApp(new string[0], msbuildPath) - .GetProcessStartInfo() - .Environment[envVar]) - .Should().NotBeNull("constructor will throw on invalid path"); - } - [Fact] public void ItSetsOrIgnoresTelemetrySessionId() { From 7af7c91eb6a4d6fad7e9acc9f8bfae7a2f7036ad Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 16 Oct 2017 15:44:15 -0700 Subject: [PATCH 22/23] Adding redist to the list of changes. I missed it in the merge commit. --- src/redist/redist.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 9f765af0f..7b9346f3c 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -92,7 +92,7 @@ ReplacementPatterns="$(ReplacementPattern)" ReplacementStrings="$(ReplacementString)" /> @@ -227,6 +227,7 @@ + From 4577a7839a05a89ecf039272faf37d30428702f7 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 17 Oct 2017 13:43:19 -0700 Subject: [PATCH 23/23] Fixing the windows build. --- src/redist/redist.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 7b9346f3c..0c131b23c 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -227,7 +227,7 @@ - +