From 207a7e4307924b55d958a4166380918e5f13a8d6 Mon Sep 17 00:00:00 2001 From: Zhi Li Date: Fri, 30 Jun 2017 14:25:46 -0700 Subject: [PATCH 1/6] update nuget to 4.3.0-preview4-4258 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index fa216040c..a4d674c7e 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -6,7 +6,7 @@ 2.3.0-beta3-61816-04 4.2.0-rc-170621-0 1.1.0-alpha-20170615-3 - 4.3.0-preview3-4168 + 4.3.0-preview4-4258 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta1-20170202-111 From cb9290e3a3f4c9d9518da1e8e136ada4bc9925bb Mon Sep 17 00:00:00 2001 From: Ashley Hauck Date: Thu, 6 Jul 2017 08:30:32 -0700 Subject: [PATCH 2/6] Update Roslyn to 2.3.0-beta4-61830-03 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 3343c25bf..7e1a4b2e7 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -3,7 +3,7 @@ 1.1.2 15.3.0-preview-000402-01 - 2.3.0-beta3-61816-04 + 2.3.0-beta4-61830-03 4.2.0-rc-170630-0 1.1.0-alpha-20170630-2 4.3.0-preview3-4168 From 8fff365c86498acd68ebe96f76ff526e0a28acb3 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 7 Jul 2017 16:24:32 -0700 Subject: [PATCH 3/6] Updating the ReadMe: "rel-1.0.1" to "rel-1.1.0" --- README.md | 82 +++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 44a0bf75b..edfdc062b 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht > **Note:** please be aware that below installers are the **latest bits**. If you > want to install the latest released versions, please check out the [section above](#download-links).) -| Platform | rel/1.0.1
[![][version-badge]][version] | +| Platform | rel/1.1.0
[![][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] | @@ -103,60 +103,60 @@ In order to download just the .NET Core runtime without the SDK, please visit ht *Note: Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* -[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/latest.version +[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/latest.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/Windows_x64_Release_version_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/Windows_x64_Release_version_badge.svg -[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x64.latest.exe -[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x64.latest.exe.sha -[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x64.latest.zip -[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x64.latest.zip.sha +[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x64.latest.exe +[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x64.latest.exe.sha +[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x64.latest.zip +[win-x64-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x64.latest.zip.sha -[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x86.latest.exe -[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x86.latest.exe.sha -[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x86.latest.zip -[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-win-x86.latest.zip.sha +[win-x86-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x86.latest.exe +[win-x86-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x86.latest.exe.sha +[win-x86-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x86.latest.zip +[win-x86-zip-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-win-x86.latest.zip.sha -[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu-x64.latest.deb -[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu-x64.latest.deb.sha -[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu-x64.latest.tar.gz -[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu-x64.latest.tar.gz.sha +[ubuntu-14.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-sdk-ubuntu-x64.latest.deb +[ubuntu-14.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-sdk-ubuntu-x64.latest.deb.sha +[ubuntu-14.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-ubuntu-x64.latest.tar.gz +[ubuntu-14.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-ubuntu-x64.latest.tar.gz.sha -[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu.16.04-x64.latest.deb.sha -[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz -[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha +[ubuntu-16.04-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-sdk-ubuntu.16.04-x64.latest.deb +[ubuntu-16.04-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-sdk-ubuntu.16.04-x64.latest.deb.sha +[ubuntu-16.04-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz +[ubuntu-16.04-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-ubuntu.16.04-x64.latest.tar.gz.sha -[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu.16.10-x64.latest.deb -[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-sdk-ubuntu.16.10-x64.latest.deb.sha -[ubuntu-16.10-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz -[ubuntu-16.10-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz.sha +[ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-sdk-ubuntu.16.10-x64.latest.deb +[ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-sdk-ubuntu.16.10-x64.latest.deb.sha +[ubuntu-16.10-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz +[ubuntu-16.10-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-ubuntu.16.10-x64.latest.tar.gz.sha -[debian-8.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-debian-x64.latest.tar.gz -[debian-8.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-debian-x64.latest.tar.gz.sha +[debian-8.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-debian-x64.latest.tar.gz +[debian-8.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-debian-x64.latest.tar.gz.sha -[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-osx-x64.latest.pkg -[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-osx-x64.latest.pkg.sha -[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-osx-x64.latest.tar.gz -[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-osx-x64.latest.tar.gz.sha +[osx-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-osx-x64.latest.pkg +[osx-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-osx-x64.latest.pkg.sha +[osx-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-osx-x64.latest.tar.gz +[osx-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-osx-x64.latest.tar.gz.sha -[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-centos-x64.latest.tar.gz -[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-centos-x64.latest.tar.gz.sha +[centos-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-centos-x64.latest.tar.gz +[centos-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-centos-x64.latest.tar.gz.sha -[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-rhel-x64.latest.tar.gz -[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-rhel-x64.latest.tar.gz.sha +[rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-rhel-x64.latest.tar.gz +[rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-rhel-x64.latest.tar.gz.sha -[opensuse-13.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-opensuse.13.2-x64.latest.tar.gz -[opensuse-13.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-opensuse.13.2-x64.latest.tar.gz.sha +[opensuse-13.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-opensuse.13.2-x64.latest.tar.gz +[opensuse-13.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-opensuse.13.2-x64.latest.tar.gz.sha -[opensuse-42.1-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-opensuse.42.1-x64.latest.tar.gz -[opensuse-42.1-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-opensuse.42.1-x64.latest.tar.gz.sha +[opensuse-42.1-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-opensuse.42.1-x64.latest.tar.gz +[opensuse-42.1-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-opensuse.42.1-x64.latest.tar.gz.sha -[fedora-23-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-fedora.23-x64.latest.tar.gz -[fedora-23-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-fedora.23-x64.latest.tar.gz.sha +[fedora-23-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-fedora.23-x64.latest.tar.gz +[fedora-23-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-fedora.23-x64.latest.tar.gz.sha -[fedora-24-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-fedora.24-x64.latest.tar.gz -[fedora-24-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.0.1/dotnet-dev-fedora.24-x64.latest.tar.gz.sha +[fedora-24-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-fedora.24-x64.latest.tar.gz +[fedora-24-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/rel-1.1.0/dotnet-dev-fedora.24-x64.latest.tar.gz.sha Docker From e8cb581990d0b1520ffa1057a36b439852d725ab Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 7 Jul 2017 16:58:51 -0700 Subject: [PATCH 4/6] Fix fedora.23 dockerfile Use existing docker image to reduce error from extra dependency. Append CLI specific packages --- scripts/docker/fedora.23/Dockerfile | 30 ++--------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/scripts/docker/fedora.23/Dockerfile b/scripts/docker/fedora.23/Dockerfile index 0c4b20d79..b8508bde7 100644 --- a/scripts/docker/fedora.23/Dockerfile +++ b/scripts/docker/fedora.23/Dockerfile @@ -4,36 +4,10 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM fedora:23 - -# Install the base toolchain we need to build anything (clang, cmake, make and the like) -# this does not include libraries that we need to compile different projects, we'd like -# them in a different layer. -RUN dnf install -y cmake \ - clang \ - lldb-devel \ - make \ - which && \ - dnf clean all +FROM microsoft/dotnet-buildtools-prereqs:fedora23_prereqs # Install tools used by the VSO build automation. -RUN dnf install -y git \ - zip \ - tar \ - nodejs \ - findutils \ - npm && \ - dnf clean all && \ - npm install -g azure-cli && \ - npm cache clean - -# Dependencies of CoreCLR and CoreFX. -RUN dnf install -y libicu-devel \ - libuuid-devel \ - libcurl-devel \ - openssl-devel \ - libunwind-devel \ - lttng-ust-devel && \ +RUN dnf install -y findutils && \ dnf clean all # Upgrade NSS, used for SSL, to avoid NuGet restore timeouts. From 3b180f49ba27b555fa6dabf8ec1a075d4920fa91 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 7 Jul 2017 23:38:20 -0700 Subject: [PATCH 5/6] Enable VB dotnet new test cases --- .../GivenThatIWantANewAppWithSpecifiedType.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index d631abdf0..1977445a8 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -25,18 +25,15 @@ namespace Microsoft.DotNet.New.Tests [InlineData("F#", "mstest", false)] [InlineData("F#", "xunit", false)] [InlineData("F#", "mvc", true)] + [InlineData("VB", "console", false)] + [InlineData("VB", "classlib", false)] + [InlineData("VB", "mstest", false)] + [InlineData("VB", "xunit", false)] public void TemplateRestoresAndBuildsWithoutWarnings( string language, string projectType, bool useNuGetConfigForAspNet) { - if (language == "F#" && !EnvironmentInfo.HasSharedFramework("netcoreapp1.0")) - { - // F# requires netcoreapp1.0 to be present in order to build - // https://github.com/dotnet/netcorecli-fsc/issues/76 - return; - } - string rootPath = TestAssetsManager.CreateTestDirectory(identifier: $"{language}_{projectType}").Path; new TestCommand("dotnet") { WorkingDirectory = rootPath } From 9a1e39f08364d7b43de54b091f2780f4c9b6f6cb Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 10 Jul 2017 10:57:28 -0700 Subject: [PATCH 6/6] Fix wrong number of parameters passed to test when doing the merge. --- .../GivenThatIWantANewAppWithSpecifiedType.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index c432cfd53..b64b3e5c1 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -31,10 +31,10 @@ namespace Microsoft.DotNet.New.Tests [InlineData("F#", "mstest", false, false)] [InlineData("F#", "xunit", false, false)] [InlineData("F#", "mvc", true, false)] - [InlineData("VB", "console", false)] - [InlineData("VB", "classlib", false)] - [InlineData("VB", "mstest", false)] - [InlineData("VB", "xunit", false)] + [InlineData("VB", "console", false, false)] + [InlineData("VB", "classlib", false, false)] + [InlineData("VB", "mstest", false, false)] + [InlineData("VB", "xunit", false, false)] public void TemplateRestoresAndBuildsWithoutWarnings( string language, string projectType,