From bcbbf6634ff3efd93758214b4370156d3d3d33c6 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Mon, 19 Feb 2018 19:02:30 +0000 Subject: [PATCH 01/11] Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview2-26219-02, preview2-26219-02, preview2-26219-02, beta1-62616-10, respectively --- build/DependencyVersions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 258fd2e3e..f3e6f0b18 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -28,8 +28,8 @@ $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) - 2.1.0-preview2-26131-06 - 2.1.0-preview2-26131-06 + 2.1.0-preview2-26219-02 + 2.1.0-preview2-26219-02 0.1.1-alpha-174 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) From b3a14f1ec9a3f15bcfac2a3c46ba63bc59954755 Mon Sep 17 00:00:00 2001 From: danmosemsft Date: Thu, 22 Feb 2018 13:34:28 -0800 Subject: [PATCH 02/11] Merge with master --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index f3e6f0b18..0f7b63583 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -69,4 +69,4 @@ 2.0.0-preview2-25331-01 - + \ No newline at end of file From 99b55ce2470be2f609d4724b2e7bd9eceacb3738 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 24 Feb 2018 17:20:23 -0800 Subject: [PATCH 03/11] Update to latest CoreFX manually --- build/DependencyVersions.props | 4 ++-- .../CommandResolution/ProjectFactory.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 0f7b63583..a95bc79ad 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -28,8 +28,8 @@ $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) - 2.1.0-preview2-26219-02 - 2.1.0-preview2-26219-02 + 2.1.0-preview2-26222-01 + 2.1.0-preview2-26222-01 0.1.1-alpha-174 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectFactory.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectFactory.cs index 31dd409ac..f62040a9b 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectFactory.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectFactory.cs @@ -70,6 +70,7 @@ namespace Microsoft.DotNet.Cli.Utils private string GetMSBuildProjPath(string projectDirectory) { + System.Console.WriteLine($"Dir={projectDirectory}"); IEnumerable projectFiles = Directory .GetFiles(projectDirectory, "*.*proj") .Where(d => !d.EndsWith(".xproj")); From 6c0944a017a428bfe225022485c2fc82a6a7487b Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 24 Feb 2018 18:01:42 -0800 Subject: [PATCH 04/11] Update again --- build/DependencyVersions.props | 2 +- .../CommandResolution/ProjectFactory.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a95bc79ad..83a296ece 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.1.0-preview2-30171 - 2.1.0-preview2-26131-06 + 2.1.0-preview2-26224-02 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000063 $(MicrosoftBuildPackageVersion) diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectFactory.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectFactory.cs index f62040a9b..31dd409ac 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectFactory.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectFactory.cs @@ -70,7 +70,6 @@ namespace Microsoft.DotNet.Cli.Utils private string GetMSBuildProjPath(string projectDirectory) { - System.Console.WriteLine($"Dir={projectDirectory}"); IEnumerable projectFiles = Directory .GetFiles(projectDirectory, "*.*proj") .Where(d => !d.EndsWith(".xproj")); From d00060d449f4ee0b6b53ed0f7904d6cc3dd76d24 Mon Sep 17 00:00:00 2001 From: danmosemsft Date: Sat, 24 Feb 2018 18:39:19 -0800 Subject: [PATCH 05/11] Use core-setup version --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 83a296ece..9c1ace8e8 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.1.0-preview2-30171 - 2.1.0-preview2-26224-02 + 2.1.0-preview2-26222-02 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000063 $(MicrosoftBuildPackageVersion) From 8a6a642d6662fa2925fe4e872d54072c5f9532fa Mon Sep 17 00:00:00 2001 From: danmosemsft Date: Sat, 24 Feb 2018 18:48:35 -0800 Subject: [PATCH 06/11] 01 --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 9c1ace8e8..816cab447 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.1.0-preview2-30171 - 2.1.0-preview2-26222-02 + 2.1.0-preview2-26222-01 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000063 $(MicrosoftBuildPackageVersion) From 3965ce70479e90476cdf9b914b28c92a047d0188 Mon Sep 17 00:00:00 2001 From: danmosemsft Date: Sat, 24 Feb 2018 20:49:01 -0800 Subject: [PATCH 07/11] Updated core-setup --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 816cab447..b8a2e6288 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.1.0-preview2-30171 - 2.1.0-preview2-26222-01 + 2.1.0-preview2-26225-01 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000063 $(MicrosoftBuildPackageVersion) @@ -28,8 +28,8 @@ $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) - 2.1.0-preview2-26222-01 - 2.1.0-preview2-26222-01 + 2.1.0-preview2-26225-01 + 2.1.0-preview2-26225-01 0.1.1-alpha-174 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) From 91fea0d7b402801f35b39cc107a39c1b73013129 Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 26 Feb 2018 12:13:26 -0800 Subject: [PATCH 08/11] ingest and publish rumtime agnostic package --- build/Branding.props | 2 +- build/BundledRuntimes.props | 4 ++-- build/LinuxDistrosNativeInstaller.props | 2 +- build/package/Installer.RPM.targets | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build/Branding.props b/build/Branding.props index eadbd0927..fa9b1f31c 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -24,7 +24,7 @@ '$(HostRid)' == 'opensuse.42.1-x64' ">$(HostRid) $(HostOSName)-$(Architecture) $(HostMonikerRid) - $(Architecture) + $(Architecture) dotnet-sdk-internal dotnet-sdk-symbols diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index aeeaf373d..9738b731e 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -12,7 +12,7 @@ $(CoreSetupRid) - x64 + x64 dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName) @@ -70,7 +70,7 @@ <_DownloadAndExtractItem Include="DownloadedRuntimeDepsInstallerFile" - Condition="'$(IsDebianBaseDistro)' == 'true' And '$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedRuntimeDepsInstallerFile)') And '$(InstallerExtension)' != ''"> + Condition="('$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true') And '$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedRuntimeDepsInstallerFile)') And '$(InstallerExtension)' != ''"> $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(DownloadedRuntimeDepsInstallerFileName)$(CoreSetupBlobAccessTokenParam) $(DownloadedRuntimeDepsInstallerFile) diff --git a/build/LinuxDistrosNativeInstaller.props b/build/LinuxDistrosNativeInstaller.props index 3827e569e..d153e267a 100644 --- a/build/LinuxDistrosNativeInstaller.props +++ b/build/LinuxDistrosNativeInstaller.props @@ -8,7 +8,7 @@ rhel rpm - rhel-x64 + x64 diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index a3a9c7992..115d6070f 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -145,6 +145,8 @@ + $(MicrosoftNETCoreAppPackageVersion) + dotnet-runtime-deps-$(RuntimeDepsPackageVersion) $(SdkVersion) $(OutputDirectory)/sdk $(InstallerOutputDirectory)/$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension) @@ -216,6 +218,7 @@ Outputs="$(RpmTestResultsXmlFile)" > + @@ -239,5 +242,6 @@ + From 80b485689a6f28ea345368d7911e396436e4228f Mon Sep 17 00:00:00 2001 From: William Li Date: Mon, 26 Feb 2018 15:51:09 -0800 Subject: [PATCH 09/11] Edit readme --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b00263619..b13340fd9 100644 --- a/README.md +++ b/README.md @@ -64,8 +64,7 @@ To download the .NET Core runtime **without** the SDK, visit https://github.com/ | **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] | | **macOS** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | -| **Linux x64** | [DEB Installer][linux-DEB-installer] - [Checksum][linux-DEB-installer-checksum]
_see installer note below_1
[tar.gz][linux-targz] - [Checksum][linux-targz-checksum] | -| **RHEL 7.2** | [Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]
[tar.gz][linux-targz] - [Checksum][linux-targz-checksum] | +| **Linux x64** | [DEB Installer][linux-DEB-installer] - [Checksum][linux-DEB-installer-checksum]
[RPM Installer][linux-RPM-installer] - [Checksum][linux-RPM-installer-checksum]
_see installer note below_1
[tar.gz][linux-targz] - [Checksum][linux-targz-checksum] | | **RHEL 6** | [tar.gz][rhel-6-targz] - [Checksum][rhel-6-targz-checksum] | | **Alpine 3.6** | [tar.gz][alpine-3.6-targz] - [Checksum][alpine-3.6-targz-checksum] | @@ -104,8 +103,8 @@ Reference notes: [linux-DEB-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.deb [linux-DEB-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.deb.sha -[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-rhel-x64.rpm -[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-rhel-x64.rpm.sha +[linux-RPM-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.rpm +[linux-RPM-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-x64.rpm.sha [rhel-6-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-rhel.6-x64.tar.gz [rhel-6-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-rhel.6-x64.tar.gz.sha From 4c36ae18f47a68ba163ccc3ce8dcb8e23644ff5c Mon Sep 17 00:00:00 2001 From: danmosemsft Date: Tue, 27 Feb 2018 19:14:42 -0800 Subject: [PATCH 10/11] Latest versions --- build/DependencyVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index b8a2e6288..df6903a20 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -2,7 +2,7 @@ 2.1.0-preview2-30171 - 2.1.0-preview2-26225-01 + 2.1.0-preview2-26227-01 $(MicrosoftNETCoreAppPackageVersion) 15.7.0-preview-000063 $(MicrosoftBuildPackageVersion) @@ -28,8 +28,8 @@ $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) - 2.1.0-preview2-26225-01 - 2.1.0-preview2-26225-01 + 2.1.0-preview2-26227-01 + 2.1.0-preview2-26227-01 0.1.1-alpha-174 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) From e7759edfdb45d11ccc111f8fee0adba3b2cb09e7 Mon Sep 17 00:00:00 2001 From: William Li Date: Wed, 28 Feb 2018 14:09:32 -0800 Subject: [PATCH 11/11] Rename test to walk around test fail And a separate issue will continue the investigation of why rename fixed a test failure --- .../ToolPackageInstallerTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs b/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs index 9c4bf61f5..ce3787cbf 100644 --- a/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs +++ b/test/Microsoft.DotNet.ToolPackage.Tests/ToolPackageInstallerTests.cs @@ -416,7 +416,7 @@ namespace Microsoft.DotNet.ToolPackage.Tests [Theory] [InlineData(false)] [InlineData(true)] - public void GivenAnInstalledPackageUninstallRollsbackWhenTransactionAborts(bool testMockBehaviorIsInSync) + public void GivenAnInstalledPackageUninstallRollsbackWhenTransactionFails(bool testMockBehaviorIsInSync) { var source = GetTestLocalFeedPath();