From 7299ec1f0a5c4f7ca7556b9fe70a4fccde1728bb Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 14 Mar 2017 17:14:53 -0700 Subject: [PATCH 01/41] Updating the CLI branding to 1.0.2 and updating the msbuild version. --- branchinfo.txt | 2 +- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- build/Microsoft.DotNet.Cli.Monikers.props | 2 +- dir.props | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/branchinfo.txt b/branchinfo.txt index 5628321e1..90286b00f 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -3,7 +3,7 @@ # Each line is expected to be in the format "[Name]=[Value]". MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_VERSION=1 +PATCH_VERSION=2 RELEASE_SUFFIX=rc4 CHANNEL=rel-1.0.1 BRANCH_NAME=rel/1.0.1 diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 3369877cc..01dd947ab 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.1 - 15.1.548 + 15.1.1012 2.0.0-rc5-61427-04 1.0.0-alpha-20170224-6 4.0.0-rtm-2283 diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props index 83a2063ae..756fa9f1b 100644 --- a/build/Microsoft.DotNet.Cli.Monikers.props +++ b/build/Microsoft.DotNet.Cli.Monikers.props @@ -1,7 +1,7 @@ - .NET Core SDK 1.0.1 + .NET Core SDK 1.0.2 Microsoft .NET Core 1.1.1 - Runtime Microsoft .NET Core 1.1.0 - Host Microsoft .NET Core 1.1.0 - Host FX Resolver diff --git a/dir.props b/dir.props index f906e8849..0c25d5e87 100644 --- a/dir.props +++ b/dir.props @@ -13,6 +13,6 @@ true - 1.0.1 + 1.0.2 From 13cf65ea8fc9c5a8a82c3b8552c4a975407fd3b7 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Fri, 20 Jan 2017 17:19:35 -0500 Subject: [PATCH 02/41] dotnet-install should identify all RHEL 7.x as RHEL New RHEL minor versions are compatible with previous RHEL minor versions. They also replace them: all users using RHEL 7.n are migrated to RHEL 7.(n+1) by a simple yum upgrade. So just treat all RHEL 7.x version as RHEL. This only holds true for minor versions. RHEL 7 is not compatible with RHEL 6. But since .NET Core only supports RHEL 7, this shouldn't matter. --- scripts/obtain/dotnet-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index 7f6f86956..89ad61b66 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -92,7 +92,7 @@ get_current_os_name() { echo "opensuse.42.1" return 0 ;; - "rhel.7.0" | "rhel.7.1" | "rhel.7.2") + "rhel.7"*) echo "rhel" return 0 ;; From 3928c2739cefbd93ee5d3a89dfe50e0afd75a862 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 27 Mar 2017 15:23:14 -0500 Subject: [PATCH 03/41] Make folder case consistent. This causes no build issues (because the .csproj uses the default wildcard include), but prevents the repo from being pushed to VSO Git. --- .../{transforms => Transforms}/AddItemTransform.cs | 0 .../{transforms => Transforms}/AddPropertyTransform.cs | 0 .../{transforms => Transforms}/ConditionalTransform.cs | 0 .../{transforms => Transforms}/ITransform.cs | 0 .../{transforms => Transforms}/ITransformApplicator.cs | 0 .../{transforms => Transforms}/IncludeContextTransform.cs | 0 .../{transforms => Transforms}/RemoveContextTransform.cs | 0 .../{transforms => Transforms}/RemoveItemTransform.cs | 0 .../{transforms => Transforms}/TransformApplicator.cs | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/AddItemTransform.cs (100%) rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/AddPropertyTransform.cs (100%) rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/ConditionalTransform.cs (100%) rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/ITransform.cs (100%) rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/ITransformApplicator.cs (100%) rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/IncludeContextTransform.cs (100%) rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/RemoveContextTransform.cs (100%) rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/RemoveItemTransform.cs (100%) rename src/Microsoft.DotNet.ProjectJsonMigration/{transforms => Transforms}/TransformApplicator.cs (100%) diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/AddItemTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/AddItemTransform.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/AddItemTransform.cs rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/AddItemTransform.cs diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/AddPropertyTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/AddPropertyTransform.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/AddPropertyTransform.cs rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/AddPropertyTransform.cs diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ConditionalTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/ConditionalTransform.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/ConditionalTransform.cs rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/ConditionalTransform.cs diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/ITransform.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransform.cs rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/ITransform.cs diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransformApplicator.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/ITransformApplicator.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/ITransformApplicator.cs rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/ITransformApplicator.cs diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/IncludeContextTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/IncludeContextTransform.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/IncludeContextTransform.cs rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/IncludeContextTransform.cs diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/RemoveContextTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/RemoveContextTransform.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/RemoveContextTransform.cs rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/RemoveContextTransform.cs diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/RemoveItemTransform.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/RemoveItemTransform.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/RemoveItemTransform.cs rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/RemoveItemTransform.cs diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/transforms/TransformApplicator.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Transforms/TransformApplicator.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectJsonMigration/transforms/TransformApplicator.cs rename to src/Microsoft.DotNet.ProjectJsonMigration/Transforms/TransformApplicator.cs From d8cc37ae00284c5024799275ae43e395a465f064 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 6 Apr 2017 13:48:20 -0700 Subject: [PATCH 04/41] Adding error code 1638 as a ignore/success error when installing the VC_Redist. --- packaging/windows/clisdk/bundle.wxs | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs index e4a4fd084..32482a781 100644 --- a/packaging/windows/clisdk/bundle.wxs +++ b/packaging/windows/clisdk/bundle.wxs @@ -42,6 +42,7 @@ ProductName="$(var.Crt_ProductName)" Size="$(var.Crt_Size)" Version="$(var.Crt_Version)" /> + From 158eea31277ee510bc38cfb3453cd926bc97b8d1 Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 6 Apr 2017 15:47:35 -0700 Subject: [PATCH 05/41] Updating the patch version of the CLI to 1.0.3 --- branchinfo.txt | 2 +- build/Microsoft.DotNet.Cli.Monikers.props | 2 +- dir.props | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/branchinfo.txt b/branchinfo.txt index 90286b00f..ddd9d6c34 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -3,7 +3,7 @@ # Each line is expected to be in the format "[Name]=[Value]". MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_VERSION=2 +PATCH_VERSION=3 RELEASE_SUFFIX=rc4 CHANNEL=rel-1.0.1 BRANCH_NAME=rel/1.0.1 diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props index 756fa9f1b..eb993cb0f 100644 --- a/build/Microsoft.DotNet.Cli.Monikers.props +++ b/build/Microsoft.DotNet.Cli.Monikers.props @@ -1,7 +1,7 @@ - .NET Core SDK 1.0.2 + .NET Core SDK 1.0.3 Microsoft .NET Core 1.1.1 - Runtime Microsoft .NET Core 1.1.0 - Host Microsoft .NET Core 1.1.0 - Host FX Resolver diff --git a/dir.props b/dir.props index 0c25d5e87..f4ab7be63 100644 --- a/dir.props +++ b/dir.props @@ -13,6 +13,6 @@ true - 1.0.2 + 1.0.3 From b654c55985fe2037ef585ecf8142637bf1ce285b Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 10 Apr 2017 17:43:47 -0500 Subject: [PATCH 06/41] Skip versions repo publish if auth not defined --- build/publish/FinishBuild.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/publish/FinishBuild.targets b/build/publish/FinishBuild.targets index 206e131f2..f0dfad763 100644 --- a/build/publish/FinishBuild.targets +++ b/build/publish/FinishBuild.targets @@ -29,6 +29,7 @@ Channel="$(Channel)" CommitHash="$(CommitHash)" /> - + From c62bc827873684ac3e5731c51b9dff79666fcd0a Mon Sep 17 00:00:00 2001 From: Ken Dale Date: Mon, 20 Mar 2017 18:09:21 -0400 Subject: [PATCH 07/41] Fix README.md table --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c52895f0..44a0bf75b 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ In order to download just the .NET Core runtime without the SDK, please visit ht > want to install the latest released versions, please check out the [section above](#download-links).) | Platform | rel/1.0.1
[![][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] | | **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
*See Installer Note Below
[tar.gz][ubuntu-14.04-targz] - [Checksum][ubuntu-14.04-targz-checksum] | From ee8f8c9bc937ccb7c50fcc4fdce9af0be2682445 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 24 Apr 2017 12:12:47 -0700 Subject: [PATCH 08/41] Porting over a change from master that allows to overwrite the CoreSetupBlobRootUrl. --- build/Microsoft.DotNet.Cli.Prepare.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index acf561e95..23991910b 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -167,7 +167,7 @@ - https://dotnetcli.azureedge.net/dotnet/ + https://dotnetcli.azureedge.net/dotnet/ $(CoreSetupBlobRootUrl)$(CoreSetupChannel) $(CoreSetupBlobRootUrlWithChannel)/Binaries/$(SharedFrameworkVersion) $(CoreSetupBlobRootUrlWithChannel)/Installers From 3efaab9fbc0cd2063820fab8f3f5abf69dac28cf Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 24 Apr 2017 17:08:54 -0500 Subject: [PATCH 09/41] Add SAS tokens to core-setup download. --- build/Microsoft.DotNet.Cli.Prepare.targets | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index 23991910b..37c52ffd4 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -47,6 +47,7 @@ win7-$(Architecture) osx.10.10-x64 rhel.7-x64 + ?$(CoreSetupBlobAccessToken) @@ -178,28 +179,28 @@ <_DownloadAndExtractItem Include="CombinedSharedHostAndFrameworkArchive" Condition="!Exists('$(CombinedSharedHostAndFrameworkArchive)')"> - $(SharedFrameworkArchiveBlobRootUrl)/$(CombinedFrameworkHostCompressedFileName) + $(SharedFrameworkArchiveBlobRootUrl)/$(CombinedFrameworkHostCompressedFileName)$(CoreSetupBlobAccessTokenParam) $(CombinedSharedHostAndFrameworkArchive) $(SharedFrameworkPublishDirectory) <_DownloadAndExtractItem Include="DownloadedSharedFrameworkInstallerFile" Condition="!Exists('$(DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupInstallerBlobRootUrl)/$(SharedFrameworkVersion)/$(DownloadedSharedFrameworkInstallerFileName) + $(CoreSetupInstallerBlobRootUrl)/$(SharedFrameworkVersion)/$(DownloadedSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(DownloadedSharedFrameworkInstallerFile) <_DownloadAndExtractItem Include="DownloadedSharedHostInstallerFile" Condition="!Exists('$(DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupInstallerBlobRootUrl)/$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName) + $(CoreSetupInstallerBlobRootUrl)/$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(DownloadedSharedHostInstallerFile) <_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile" Condition="!Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName) + $(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(DownloadedHostFxrInstallerFile) @@ -217,7 +218,7 @@ <_DownloadAndExtractItem Include="AdditionalCombinedSharedHostAndFrameworkArchive" Condition="!Exists('$(AdditionalCombinedSharedHostAndFrameworkArchive)')"> - $(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName) + $(AdditionalSharedFrameworkArchiveBlobRootUrl)/$(AdditionalCombinedFrameworkHostCompressedFileName)$(CoreSetupBlobAccessTokenParam) $(AdditionalCombinedSharedHostAndFrameworkArchive) $(SharedFrameworkPublishDirectory) @@ -226,21 +227,21 @@ <_DownloadAndExtractItem Include="AdditionalDownloadedSharedFrameworkInstallerFile" Condition="!Exists('$(AdditionalDownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> - $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedFrameworkVersion)/$(AdditionalDownloadedSharedFrameworkInstallerFileName) + $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedFrameworkVersion)/$(AdditionalDownloadedSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(AdditionalDownloadedSharedFrameworkInstallerFile) <_DownloadAndExtractItem Include="AdditionalDownloadedSharedHostInstallerFile" Condition="!Exists('$(AdditionalDownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> - $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedHostVersion)/$(AdditionalDownloadedSharedHostInstallerFileName) + $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalSharedHostVersion)/$(AdditionalDownloadedSharedHostInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(AdditionalDownloadedSharedHostInstallerFile) <_DownloadAndExtractItem Include="AdditionalDownloadedHostFxrInstallerFile" Condition="!Exists('$(AdditionalDownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> - $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName) + $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(AdditionalDownloadedHostFxrInstallerFile) From de7c94592dff5e8880e6300e37413c84fc35ff5d Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 24 Apr 2017 18:11:59 -0700 Subject: [PATCH 10/41] Updating the runtime framework versions for 1.0.5 and 1.1.1 and updating the CLI branding to 1.0.4. --- branchinfo.txt | 2 +- build.proj | 6 +++--- build/Microsoft.DotNet.Cli.DependencyVersions.props | 4 ++-- build/Microsoft.DotNet.Cli.Monikers.props | 6 +++--- build/Microsoft.DotNet.Cli.Prepare.targets | 2 +- build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 2 +- dir.props | 2 +- .../GivenAProjectToolsCommandResolver.cs | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/branchinfo.txt b/branchinfo.txt index ddd9d6c34..ec5a72654 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -3,7 +3,7 @@ # Each line is expected to be in the format "[Name]=[Value]". MAJOR_VERSION=1 MINOR_VERSION=0 -PATCH_VERSION=3 +PATCH_VERSION=4 RELEASE_SUFFIX=rc4 CHANNEL=rel-1.0.1 BRANCH_NAME=rel/1.0.1 diff --git a/build.proj b/build.proj index 2a1233295..fd7f7f235 100644 --- a/build.proj +++ b/build.proj @@ -19,12 +19,12 @@ release/1.1.0 Microsoft.NETCore.App - 1.1.1 + 1.1.2 1.1.0 1.1.0 - 1.1.1 - 1.1.1 + 1.1.2 + 1.1.2 .exe diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 01dd947ab..a34ceed0c 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -1,10 +1,10 @@ - 1.1.1 + 1.1.2 15.1.1012 2.0.0-rc5-61427-04 - 1.0.0-alpha-20170224-6 + 1.0.0-alpha-20170425-3 4.0.0-rtm-2283 1.0.0-alpha-20170130-3-281 15.0.0 diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props index eb993cb0f..197dcaa82 100644 --- a/build/Microsoft.DotNet.Cli.Monikers.props +++ b/build/Microsoft.DotNet.Cli.Monikers.props @@ -1,12 +1,12 @@ - .NET Core SDK 1.0.3 - Microsoft .NET Core 1.1.1 - Runtime + .NET Core SDK 1.0.4 + Microsoft .NET Core 1.1.2 - Runtime Microsoft .NET Core 1.1.0 - Host Microsoft .NET Core 1.1.0 - Host FX Resolver - Microsoft .NET Core 1.0.4 - Runtime + Microsoft .NET Core 1.0.5 - Runtime Microsoft .NET Core 1.0.1 - Host Microsoft .NET Core 1.0.1 - Host FX Resolver diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index 37c52ffd4..e15fc6e35 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -144,7 +144,7 @@ preview - 1.0.4 + 1.0.5 1.0.1 1.0.1 diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 745b80f41..e1fafb957 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -17,7 +17,7 @@ 1.6.0 - 1.1.1 + 1.1.2 $(CLI_MSBuild_Version) diff --git a/dir.props b/dir.props index f4ab7be63..1ed8b03c9 100644 --- a/dir.props +++ b/dir.props @@ -13,6 +13,6 @@ true - 1.0.3 + 1.0.4 diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 44ce24766..21612a2a0 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -308,7 +308,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 1.1.1"); + result.Args.Should().Contain("--fx-version 1.1.2"); } [Fact] From dcff438d5adb1399b2d84dbb92c754edbe68e234 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 25 Apr 2017 13:39:08 -0500 Subject: [PATCH 11/41] Add new variables to dockerrun.sh so they're passed to the container. --- scripts/dockerrun.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh index d5caeb312..b800a0106 100755 --- a/scripts/dockerrun.sh +++ b/scripts/dockerrun.sh @@ -136,5 +136,12 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e COMMITCOUNT \ -e DROPSUFFIX \ -e RELEASESUFFIX \ + -e CoreFxAzureContainer \ + -e AzureAccountName \ + -e AzureAccessToken \ + -e VsoPassword \ + -e ReleaseToolsGitUrl \ + -e CoreSetupBlobRootUrl \ + -e CoreSetupBlobAccessToken \ $DOTNET_BUILD_CONTAINER_TAG \ $BUILD_COMMAND "$@" From f66867a7f4bc91e6cbfb1059a552eba59baae811 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 25 Apr 2017 15:59:52 -0500 Subject: [PATCH 12/41] Fix case for variables we pass into docker. --- scripts/dockerrun.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh index b800a0106..897aeb907 100755 --- a/scripts/dockerrun.sh +++ b/scripts/dockerrun.sh @@ -136,12 +136,12 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e COMMITCOUNT \ -e DROPSUFFIX \ -e RELEASESUFFIX \ - -e CoreFxAzureContainer \ - -e AzureAccountName \ - -e AzureAccessToken \ - -e VsoPassword \ - -e ReleaseToolsGitUrl \ - -e CoreSetupBlobRootUrl \ - -e CoreSetupBlobAccessToken \ + -e COREFXAZURECONTAINER \ + -e AZUREACCOUNTNAME \ + -e AZUREACCESSTOKEN \ + -e VSOPASSWORD \ + -e RELEASETOOLSGITURL \ + -e CORESETUPBLOBROOTURL \ + -e CORESETUPBLOBACCESSTOKEN \ $DOTNET_BUILD_CONTAINER_TAG \ $BUILD_COMMAND "$@" From 5be74db44056c79f0e4e972f489289fdb1bff69b Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 25 Apr 2017 15:10:39 -0700 Subject: [PATCH 13/41] Conditioning the version of hostfxr on the OS, because for Windows it actually has a different version. --- build.proj | 3 ++- build/Microsoft.DotNet.Cli.Prepare.targets | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.proj b/build.proj index fd7f7f235..0b065edbf 100644 --- a/build.proj +++ b/build.proj @@ -21,7 +21,8 @@ Microsoft.NETCore.App 1.1.2 1.1.0 - 1.1.0 + 1.1.0 + 1.1.2 1.1.2 1.1.2 diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index e15fc6e35..91acac4dd 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -146,7 +146,8 @@ preview 1.0.5 1.0.1 - 1.0.1 + 1.0.1 + 1.0.5 dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension) From 9ec01bdce0f3cf5c7d70f295aa5eb11e88d464d3 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 25 Apr 2017 15:25:05 -0700 Subject: [PATCH 14/41] Making the code consistent in Prepare.targets. --- build/Microsoft.DotNet.Cli.Prepare.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index 91acac4dd..302b7e6c6 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -146,8 +146,8 @@ preview 1.0.5 1.0.1 - 1.0.1 - 1.0.5 + 1.0.1 + 1.0.5 dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension) From 8e7cd5c550165b4727f74dd97f1f61b4f25e8f4c Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 25 Apr 2017 20:38:41 -0700 Subject: [PATCH 15/41] Add a hostfxr container version, because even a 1.1.2 hostfxr is being binplaced in a 1.1.0 container. --- build.proj | 1 + build/Microsoft.DotNet.Cli.Prepare.targets | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.proj b/build.proj index 0b065edbf..37dadf33d 100644 --- a/build.proj +++ b/build.proj @@ -21,6 +21,7 @@ Microsoft.NETCore.App 1.1.2 1.1.0 + 1.1.0 1.1.0 1.1.2 diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index 302b7e6c6..0a47f2622 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -146,6 +146,7 @@ preview 1.0.5 1.0.1 + 1.0.1 1.0.1 1.0.5 @@ -201,7 +202,7 @@ <_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile" Condition="!Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(CoreSetupInstallerBlobRootUrl)/$(HostFxrContainerVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(DownloadedHostFxrInstallerFile) @@ -242,7 +243,7 @@ <_DownloadAndExtractItem Include="AdditionalDownloadedHostFxrInstallerFile" Condition="!Exists('$(AdditionalDownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> - $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrContainerVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(AdditionalDownloadedHostFxrInstallerFile) From d227fff356c15965b32e16592d04e275cfbf27c3 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 26 Apr 2017 15:24:22 -0700 Subject: [PATCH 16/41] Updating SDK to 1.0.0-alpha-20170426-3. --- 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 a34ceed0c..7ce26b482 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -4,7 +4,7 @@ 1.1.2 15.1.1012 2.0.0-rc5-61427-04 - 1.0.0-alpha-20170425-3 + 1.0.0-alpha-20170426-3 4.0.0-rtm-2283 1.0.0-alpha-20170130-3-281 15.0.0 From 615f3783c80ecaf3e355bba0a25cd5ee2785cf27 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Thu, 27 Apr 2017 14:25:32 -0500 Subject: [PATCH 17/41] Dummy commit to kick off build. From e5f6a150a8e9754d666c3bfb1b53ac42fe7cb5cb Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Wed, 26 Apr 2017 13:40:28 -0700 Subject: [PATCH 18/41] Ingest updated template packages --- 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 7ce26b482..017764ed2 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -9,7 +9,7 @@ 1.0.0-alpha-20170130-3-281 15.0.0 1.0.0-beta1-20170202-111 - 1.0.0-beta1-20170223-126 + 1.0.0-beta1-20170424-173 1.0.3 1.0.3 From 17c160e4c21b92f66324e1e0623c8b2c5ed374a7 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Thu, 27 Apr 2017 14:14:15 -0700 Subject: [PATCH 19/41] Update template package version --- 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 017764ed2..e004e7f5b 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -9,7 +9,7 @@ 1.0.0-alpha-20170130-3-281 15.0.0 1.0.0-beta1-20170202-111 - 1.0.0-beta1-20170424-173 + 1.0.0-beta1-20170427-174 1.0.3 1.0.3 From e056c00634dd1a373cda81dabd004f4d4d001a0e Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Fri, 28 Apr 2017 15:07:39 -0500 Subject: [PATCH 20/41] Dummy commit to kick off the build. From f983b804f82595f53f748e89f387a822b6300758 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 28 Apr 2017 22:30:21 -0700 Subject: [PATCH 21/41] Fixing a first run test that checks the version of the mvc package. It checked for 1.0.3 and 1.1.2 and it needs to check for 1.0.4 and 1.1.3 now. --- .../GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index b6981d924..273d4fd21 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -118,7 +118,7 @@ A command is running to initially populate your local package cache, to improve _nugetCacheFolder .GetDirectory("microsoft.aspnetcore.mvc") - .Should().HaveDirectories(new string[] { "1.0.3", "1.1.2" }); + .Should().HaveDirectories(new string[] { "1.0.4", "1.1.3" }); } private string GetDotnetVersion() From f68d8258100295f97a510ee53ca5b76a641431c2 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Sun, 30 Apr 2017 21:34:00 +0200 Subject: [PATCH 22/41] bump f# sdk package version --- build/Microsoft.DotNet.Cli.BundledSdks.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.props b/build/Microsoft.DotNet.Cli.BundledSdks.props index 23b7ec739..cca608b6b 100644 --- a/build/Microsoft.DotNet.Cli.BundledSdks.props +++ b/build/Microsoft.DotNet.Cli.BundledSdks.props @@ -7,6 +7,6 @@ - + From a8f606c47957914ba53397376355828977032cb2 Mon Sep 17 00:00:00 2001 From: Enrico Sada Date: Sun, 30 Apr 2017 21:39:10 +0200 Subject: [PATCH 23/41] the FSharp.NET.Sdk version `-bundled` contains only the Sdk dir --- build/Microsoft.DotNet.Cli.BundledSdks.proj | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.proj b/build/Microsoft.DotNet.Cli.BundledSdks.proj index a17c04fe1..4408ca0a4 100644 --- a/build/Microsoft.DotNet.Cli.BundledSdks.proj +++ b/build/Microsoft.DotNet.Cli.BundledSdks.proj @@ -17,9 +17,6 @@ - - - From b5cd16a9e9107d314bf1fd7b4cdd288e64823148 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 1 May 2017 10:33:46 -0500 Subject: [PATCH 24/41] Dummy commit to kick off the build. From 2e2fb1b2ecc0c171f2b228a5de7c43e93818a703 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 1 May 2017 19:05:52 -0700 Subject: [PATCH 25/41] Updating the msbuild, SDK and Web SDK versions. --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index e004e7f5b..4d1150c7c 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,11 +2,11 @@ 1.1.2 - 15.1.1012 + 15.3.0-preview-000117-01 2.0.0-rc5-61427-04 - 1.0.0-alpha-20170426-3 + 1.0.0-alpha-20170502-1 4.0.0-rtm-2283 - 1.0.0-alpha-20170130-3-281 + 1.0.0-alpha-20170502-2-477 15.0.0 1.0.0-beta1-20170202-111 1.0.0-beta1-20170427-174 From 0e60fea7dcce9447dc9964775af5c44492845a12 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 1 May 2017 19:38:02 -0700 Subject: [PATCH 26/41] Adding the web feed to nuget.config, as some packages failed to mirror and we need a build ASAP. --- NuGet.Config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.Config b/NuGet.Config index 556ee5919..f086048be 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -10,5 +10,6 @@ + From 7727c40ffa15c79a7ef18396800f8efb3de1fe60 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 2 May 2017 11:09:20 -0700 Subject: [PATCH 27/41] Reverting the msbuild version to the release version. --- 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 4d1150c7c..278a6fd85 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.2 - 15.3.0-preview-000117-01 + 15.1.1012 2.0.0-rc5-61427-04 1.0.0-alpha-20170502-1 4.0.0-rtm-2283 From 0241b24b4cb63991972acbb162f7046be4100e7f Mon Sep 17 00:00:00 2001 From: Livar Date: Wed, 3 May 2017 11:14:22 -0700 Subject: [PATCH 28/41] Dummy change to force a build. --- Documentation/ProjectJsonToCSProj.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/ProjectJsonToCSProj.md b/Documentation/ProjectJsonToCSProj.md index 92a16f4b3..5ad36c7ed 100644 --- a/Documentation/ProjectJsonToCSProj.md +++ b/Documentation/ProjectJsonToCSProj.md @@ -1,4 +1,4 @@ -.NET CLI preview 3 is coming, and with it comes the .csproj project file format and msbuild engine. The team has put a lot of focus on making the transition as seamless as possible, but as with any change of this magnitude there are some gotcha's to keep in mind. This issue explains how to use the .NET CLI during this transitional period. +.NET CLI preview 3 is here, and with it comes the .csproj project file format and msbuild engine. The team has put a lot of focus on making the transition as seamless as possible, but as with any change of this magnitude there are some gotcha's to keep in mind. This issue explains how to use the .NET CLI during this transitional period. # Overview Starting with @coolcsh's great post [Changes to Project.json](https://blogs.msdn.microsoft.com/dotnet/2016/05/23/changes-to-project-json/) the team has been hard at work moving the .NET command line story from project.json to msbuild. Our plan was fairly straightforward: From 8db1275396b5c18654093c8bcd6281eae7e380cf Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 3 May 2017 11:40:52 -0700 Subject: [PATCH 29/41] Adding the access token to the lzma url. --- build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets index c251348f1..98d44bf35 100644 --- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets +++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets @@ -131,7 +131,7 @@ $(IntermediateDirectory)/$(NugetPackagesArchiveName) $(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma $(Product)/NuGetPackagesArchives - $(DotnetBlobRootUrl)/$(NugetPackagesArchiveRelativeBlobUrl)/$(NugetPackagesArchiveName) + $(DotnetBlobRootUrl)/$(NugetPackagesArchiveRelativeBlobUrl)/$(NugetPackagesArchiveName)$(CoreSetupBlobAccessTokenParam) \ No newline at end of file From 4a134bbdf447a629d163114d036a89a8e97da56b Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 4 May 2017 13:25:26 -0700 Subject: [PATCH 30/41] Dummy commit. --- Documentation/ProjectJsonToCSProj.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/ProjectJsonToCSProj.md b/Documentation/ProjectJsonToCSProj.md index 5ad36c7ed..3b3e404e8 100644 --- a/Documentation/ProjectJsonToCSProj.md +++ b/Documentation/ProjectJsonToCSProj.md @@ -60,3 +60,4 @@ When `preview2` shipped the Visual Studio new project templates included both a We included this file by default as a future-proofing tactic. When the CLI launches it looks for this file in the current directory, or the nearest parent directory, and tries to find a matching version of itself. If an exact match is found then it is used. Otherwise, `dotnet.exe` picks the latest installed CLI. When there is no exact match AND preview3 is installed then we get into trouble because preview3 cannot reason about project.json files. When working with `preview2` and `preview3` on the same machine we need to be sure that `preview2` projects have a global.json present and that the `version` property is set to an installed preview2 version. This will typically be `1.0.0-preview2-003121` or `1.0.0-preview2-003131`. You can check what is installed by looking in `%PROGRAM FILES%\dotnet\sdk` and checking the folder names. + From 04b60dadc4c92a5111e0c92d68f6edc89a99f4b4 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 17 May 2017 16:00:49 -0700 Subject: [PATCH 31/41] Updating the branding to rel/1.1.0 --- branchinfo.txt | 8 ++++---- build/Microsoft.DotNet.Cli.Monikers.props | 2 +- dir.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/branchinfo.txt b/branchinfo.txt index ec5a72654..d138bff9b 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -2,8 +2,8 @@ # Any line that is not blank and does not start with '#' is interpreted as a variable to set # Each line is expected to be in the format "[Name]=[Value]". MAJOR_VERSION=1 -MINOR_VERSION=0 -PATCH_VERSION=4 +MINOR_VERSION=1 +PATCH_VERSION=0 RELEASE_SUFFIX=rc4 -CHANNEL=rel-1.0.1 -BRANCH_NAME=rel/1.0.1 +CHANNEL=rel-1.1.0 +BRANCH_NAME=rel/1.1.0 diff --git a/build/Microsoft.DotNet.Cli.Monikers.props b/build/Microsoft.DotNet.Cli.Monikers.props index 197dcaa82..b7bd72b9e 100644 --- a/build/Microsoft.DotNet.Cli.Monikers.props +++ b/build/Microsoft.DotNet.Cli.Monikers.props @@ -1,7 +1,7 @@ - .NET Core SDK 1.0.4 + .NET Core SDK 1.1.0 Microsoft .NET Core 1.1.2 - Runtime Microsoft .NET Core 1.1.0 - Host Microsoft .NET Core 1.1.0 - Host FX Resolver diff --git a/dir.props b/dir.props index 1ed8b03c9..9cfe93b1e 100644 --- a/dir.props +++ b/dir.props @@ -13,6 +13,6 @@ true - 1.0.4 + 1.1.0 From f270ecd025886f7f9d539d038998c6fb51c58c7e Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 17 May 2017 21:06:42 -0700 Subject: [PATCH 32/41] Pinning the stage0 to the last build out of rel/1.0.1 and adding a project to download 1.0 dependencies for test assets. --- run-build.ps1 | 4 ++-- run-build.sh | 4 ++-- tools/TestAssetsDependencies/TestAssetsDependencies.csproj | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100755 tools/TestAssetsDependencies/TestAssetsDependencies.csproj diff --git a/run-build.ps1 b/run-build.ps1 index 74edf1b42..46e4b5ed3 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -103,8 +103,8 @@ if ($LastExitCode -ne 0) # install the post-PJnistic stage0 $dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1" -Write-Host "$dotnetInstallPath -Channel ""rel-1.0.1"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" -Invoke-Expression "$dotnetInstallPath -Channel ""rel-1.0.1"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Write-Host "$dotnetInstallPath -Version ""1.0.4"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" +Invoke-Expression "$dotnetInstallPath -Version ""1.0.4"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" if ($LastExitCode -ne 0) { Write-Output "The .NET CLI installation failed with exit code $LastExitCode" diff --git a/run-build.sh b/run-build.sh index f44a6619a..fcce351df 100755 --- a/run-build.sh +++ b/run-build.sh @@ -164,8 +164,8 @@ if [ $? != 0 ]; then fi # now execute the script -echo "installing CLI: $dotnetInstallPath --channel \"rel-1.0.1\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\"" -$dotnetInstallPath --channel "rel-1.0.1" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE" +echo "installing CLI: $dotnetInstallPath --version \"1.0.4\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\"" +$dotnetInstallPath --version "1.0.4" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE" if [ $? != 0 ]; then echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2 exit $? diff --git a/tools/TestAssetsDependencies/TestAssetsDependencies.csproj b/tools/TestAssetsDependencies/TestAssetsDependencies.csproj new file mode 100755 index 000000000..26129c334 --- /dev/null +++ b/tools/TestAssetsDependencies/TestAssetsDependencies.csproj @@ -0,0 +1,7 @@ + + + + netcoreapp1.0 + + + From 2c24c622ec5586540f0f6f92f5e431203a24294d Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 17 May 2017 23:12:14 -0700 Subject: [PATCH 33/41] Trying to fix the opensuse42 test failure, where we tried to invoke a tool that target 1.0.4 where the 1.0 runtime is not available. --- .../dotnet-dependency-context-test.csproj | 2 +- build/package/dotnet-deb-tool-consumer.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj index aa4728ca9..663e061e2 100644 --- a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj @@ -17,7 +17,7 @@ - 1.0.4 + $(CLI_SharedFrameworkVersion) $(DependencyModelVersion) diff --git a/build/package/dotnet-deb-tool-consumer.csproj b/build/package/dotnet-deb-tool-consumer.csproj index 26b7aa79d..6b84531cb 100644 --- a/build/package/dotnet-deb-tool-consumer.csproj +++ b/build/package/dotnet-deb-tool-consumer.csproj @@ -3,6 +3,6 @@ netcoreapp1.1 - + From c02df7346607980b46b04a8e45941155e2c6321c Mon Sep 17 00:00:00 2001 From: Vijay Ramakrishnan Date: Thu, 18 May 2017 19:37:39 -0700 Subject: [PATCH 34/41] Updating the websdk version for 1.0 --- 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 278a6fd85..793e50b0f 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -6,7 +6,7 @@ 2.0.0-rc5-61427-04 1.0.0-alpha-20170502-1 4.0.0-rtm-2283 - 1.0.0-alpha-20170502-2-477 + 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta1-20170202-111 1.0.0-beta1-20170427-174 From fd953738f036673690029a421388b2bd13a8a584 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 18 May 2017 21:09:09 -0700 Subject: [PATCH 35/41] Dropping a global.json when running the first run experience with a version that matches the version of the CLI being used in the command that triggered the first run. --- src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs index 297909c77..246d0f462 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System.IO; using System.Collections.Generic; using System.Linq; using Microsoft.DotNet.Cli.Utils; @@ -85,6 +86,14 @@ namespace Microsoft.DotNet.Configurer { var workingDirectory = temporaryDotnetNewDirectory.DirectoryPath; + File.WriteAllText( + Path.Combine(workingDirectory, "global.json"), + $@"{{ + ""sdk"": {{ + ""version"":""{Product.Version}"" + }} + }}"); + succeeded &= CreateTemporaryProject(workingDirectory, templateInfo); if (succeeded) @@ -129,6 +138,7 @@ namespace Microsoft.DotNet.Configurer if (commandResult.ExitCode != 0) { + Reporter.Verbose.WriteLine(commandResult.StdOut); Reporter.Verbose.WriteLine(commandResult.StdErr); Reporter.Error.WriteLine( From f67a72d9c4d7a7a0ab72d672374aacec718b22ab Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Fri, 19 May 2017 21:35:45 -0700 Subject: [PATCH 36/41] Making restore use a config file so that it does not use fallback folders that may exist in the machine. --- build/Microsoft.DotNet.Cli.Prepare.targets | 6 ++++-- .../NuGetCachePrimer.cs | 16 +++++++++++++--- .../FileWrapper.cs | 5 +++++ .../IFile.cs | 2 ++ .../GivenANuGetCachePrimer.cs | 19 +++++++++++++++++-- .../GivenANuGetCacheSentinel.cs | 5 +++++ .../Mock/FileSystemMockBuilder.cs | 6 ++++++ .../GivenThatIWantToRestoreApp.cs | 8 +++++--- 8 files changed, 57 insertions(+), 10 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index 0a47f2622..c241433d7 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -281,7 +281,8 @@ + ProjectPath=""%(RestoreSrcPackagesInput.FullPath)"" + ConfigFile="$(RepoRoot)\NuGet.Config" /> @@ -306,7 +307,8 @@ + ProjectPath=""%(RestoreToolsPackagesInput.FullPath)"" + ConfigFile="$(RepoRoot)\NuGet.Config" /> diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs index 246d0f462..d4718c002 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs @@ -85,6 +85,16 @@ namespace Microsoft.DotNet.Configurer using (var temporaryDotnetNewDirectory = _directory.CreateTemporaryDirectory()) { var workingDirectory = temporaryDotnetNewDirectory.DirectoryPath; + var nugetConfigPath = Path.Combine(workingDirectory, "NuGet.Config"); + + _file.WriteAllText( + nugetConfigPath, + $@" + + + + +"); File.WriteAllText( Path.Combine(workingDirectory, "global.json"), @@ -98,7 +108,7 @@ namespace Microsoft.DotNet.Configurer if (succeeded) { - succeeded &= RestoreTemporaryProject(extractedPackagesArchiveDirectory, workingDirectory); + succeeded &= RestoreTemporaryProject(nugetConfigPath, workingDirectory); } } } @@ -118,11 +128,11 @@ namespace Microsoft.DotNet.Configurer workingDirectory); } - private bool RestoreTemporaryProject(string extractedPackagesArchiveDirectory, string workingDirectory) + private bool RestoreTemporaryProject(string nugetConfigPath, string workingDirectory) { return RunCommand( "restore", - new[] { "-s", extractedPackagesArchiveDirectory }, + new[] { "--configfile", nugetConfigPath }, workingDirectory); } diff --git a/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs b/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs index 9a71ba5d2..47de50767 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/FileWrapper.cs @@ -40,5 +40,10 @@ namespace Microsoft.Extensions.EnvironmentAbstractions { } } + + public void WriteAllText(string path, string content) + { + File.WriteAllText(path, content); + } } } \ No newline at end of file diff --git a/src/Microsoft.DotNet.InternalAbstractions/IFile.cs b/src/Microsoft.DotNet.InternalAbstractions/IFile.cs index 3e19c63f0..d29a6bc91 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/IFile.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/IFile.cs @@ -22,5 +22,7 @@ namespace Microsoft.Extensions.EnvironmentAbstractions FileOptions fileOptions); void CreateEmptyFile(string path); + + void WriteAllText(string path, string content); } } \ No newline at end of file diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs index 3268bfed2..79769e8db 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; +using System.IO; using FluentAssertions; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Tools.Test.Utilities.Mock; @@ -150,12 +151,26 @@ namespace Microsoft.DotNet.Configurer.UnitTests } [Fact] - public void It_uses_the_packages_archive_with_dotnet_restore() + public void It_writes_a_config_file_with_the_extracted_archive_as_a_package_source() { + var nugetConfigPath = Path.Combine(_temporaryDirectoryMock.DirectoryPath, "NuGet.Config"); + _fileSystemMock.File.ReadAllText(nugetConfigPath).Should().Be( + $@" + + + + +"); + } + + [Fact] + public void It_uses_a_config_file_with_dotnet_restore() + { + var nugetConfigPath = Path.Combine(_temporaryDirectoryMock.DirectoryPath, "NuGet.Config"); _commandFactoryMock.Verify( c => c.Create( "restore", - new[] { "-s", $"{PACKAGES_ARCHIVE_PATH}" }, + new[] { "--configfile", nugetConfigPath }, null, Constants.DefaultConfiguration), Times.Exactly(2)); diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs index 3971462db..992679f60 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCacheSentinel.cs @@ -175,6 +175,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests { throw new NotImplementedException(); } + + public void WriteAllText(string path, string content) + { + throw new NotImplementedException(); + } } private class MockStream : MemoryStream diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs index 9176cc2d8..46db578c1 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Mock/FileSystemMockBuilder.cs @@ -60,6 +60,7 @@ namespace Microsoft.Extensions.DependencyModel.Tests private class FileMock : IFile { private Dictionary _files; + public FileMock(Dictionary files) { _files = files; @@ -100,6 +101,11 @@ namespace Microsoft.Extensions.DependencyModel.Tests { _files.Add(path, string.Empty); } + + public void WriteAllText(string path, string content) + { + _files[path] = content; + } } private class DirectoryMock : IDirectory diff --git a/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs b/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs index cbe226760..416b8908a 100644 --- a/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs +++ b/test/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs @@ -14,6 +14,8 @@ namespace Microsoft.DotNet.Restore.Tests { public class GivenThatIWantToRestoreApp : TestBase { + private static string RepoRootNuGetConfig = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config"); + [Fact] public void ItRestoresAppToSpecificDirectory() { @@ -29,7 +31,7 @@ namespace Microsoft.DotNet.Restore.Tests .Should() .Pass(); - string args = $"--packages \"{dir}\""; + string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\""; new RestoreCommand() .WithWorkingDirectory(rootPath) .ExecuteWithCapturedOutput(args) @@ -56,7 +58,7 @@ namespace Microsoft.DotNet.Restore.Tests .Should() .Pass(); - string args = $"--packages \"{dir}\""; + string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\""; new RestoreCommand() .WithWorkingDirectory(rootPath) .ExecuteWithCapturedOutput(args) @@ -76,7 +78,7 @@ namespace Microsoft.DotNet.Restore.Tests string dir = "pkgs"; string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir)); - string args = $"--packages \"{dir}\""; + string args = $"--configfile {RepoRootNuGetConfig} --packages \"{dir}\""; new RestoreCommand() .WithWorkingDirectory(rootPath) .ExecuteWithCapturedOutput(args) From 822b290bb636936c493cd6277a2cd54bb3def989 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 22 May 2017 09:51:30 -0700 Subject: [PATCH 37/41] Updating the global.json creation to use the IFile interface and adding a unit test to cover it. --- src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs | 10 +++++----- .../GivenANuGetCachePrimer.cs | 12 ++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs index d4718c002..0414c5ca1 100644 --- a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs +++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs @@ -96,13 +96,13 @@ namespace Microsoft.DotNet.Configurer "); - File.WriteAllText( + _file.WriteAllText( Path.Combine(workingDirectory, "global.json"), $@"{{ - ""sdk"": {{ - ""version"":""{Product.Version}"" - }} - }}"); + ""sdk"": {{ + ""version"":""{Product.Version}"" + }} +}}"); succeeded &= CreateTemporaryProject(workingDirectory, templateInfo); diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs index 79769e8db..e1c8168b3 100644 --- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs +++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs @@ -163,6 +163,18 @@ namespace Microsoft.DotNet.Configurer.UnitTests "); } + [Fact] + public void It_writes_a_global_json_file_with_the_current_cli_version() + { + var nugetConfigPath = Path.Combine(_temporaryDirectoryMock.DirectoryPath, "global.json"); + _fileSystemMock.File.ReadAllText(nugetConfigPath).Should().Be( + $@"{{ + ""sdk"": {{ + ""version"":""{Product.Version}"" + }} +}}"); + } + [Fact] public void It_uses_a_config_file_with_dotnet_restore() { From 4b0528110d49bda765f5150e21b8f08ae4d72edc Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 23 May 2017 23:43:39 -0700 Subject: [PATCH 38/41] Updating MSBuild to 15.3.0-preview-000246-05 to match VS. --- 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 793e50b0f..7e1d7ee8d 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -2,7 +2,7 @@ 1.1.2 - 15.1.1012 + 15.3.0-preview-000246-05 2.0.0-rc5-61427-04 1.0.0-alpha-20170502-1 4.0.0-rtm-2283 From cfe06a96cf4b61b20cba0bfcaeac3f1ddb020ee9 Mon Sep 17 00:00:00 2001 From: Nat Ayewah Date: Wed, 24 May 2017 11:38:32 -0700 Subject: [PATCH 39/41] Update NuGet to 4.3.0-preview1-4081 and SDK to corresponding 1.1.0 based version --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 793e50b0f..dcd82f99d 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -4,8 +4,8 @@ 1.1.2 15.1.1012 2.0.0-rc5-61427-04 - 1.0.0-alpha-20170502-1 - 4.0.0-rtm-2283 + 1.1.0-alpha-20170524-4 + 4.3.0-preview1-4081 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta1-20170202-111 From abcffdd51f15bf85f0fced1a1f9fd6556136ece9 Mon Sep 17 00:00:00 2001 From: Nat Ayewah Date: Wed, 24 May 2017 14:20:52 -0700 Subject: [PATCH 40/41] Update NuGet to 4.3.0-preview2-4082 --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index dcd82f99d..d621f76ef 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -4,8 +4,8 @@ 1.1.2 15.1.1012 2.0.0-rc5-61427-04 - 1.1.0-alpha-20170524-4 - 4.3.0-preview1-4081 + 1.1.0-alpha-20170524-5 + 4.3.0-preview2-4082 1.0.0-alpha-20170516-2-509 15.0.0 1.0.0-beta1-20170202-111 From 9a669ab30c815725174d5df4eede707715db4f3f Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Thu, 25 May 2017 09:47:18 -0700 Subject: [PATCH 41/41] Updating the Sdk to one that includes the error surfacing work. --- 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 faed8480f..bed91539b 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -4,7 +4,7 @@ 1.1.2 15.3.0-preview-000246-05 2.0.0-rc5-61427-04 - 1.1.0-alpha-20170524-5 + 1.1.0-alpha-20170525-2 4.3.0-preview2-4082 1.0.0-alpha-20170516-2-509 15.0.0