From 337d579949989fbb272010f5cd19e52081253d1f Mon Sep 17 00:00:00 2001 From: "Rohit Agrawal (NUGET)" Date: Tue, 17 Jan 2017 11:08:17 -0800 Subject: [PATCH 01/11] update nuget and sdk to run a trial build --- .../dotnet-dependency-tool-invoker.csproj | 2 +- build/Microsoft.DotNet.Cli.BundledSdks.props | 2 +- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.csproj | 8 ++++---- src/redist/redist.csproj | 2 +- src/tool_nuget/tool_nuget.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.Tests.csproj | 8 ++++---- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj index a67ca793b..d3257128f 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj @@ -24,7 +24,7 @@ 1.0.3 - 4.0.0-rc3 + 4.0.0-rc3-2215 $(SdkNugetVersion) diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.props b/build/Microsoft.DotNet.Cli.BundledSdks.props index baab92a0b..2898c04c4 100644 --- a/build/Microsoft.DotNet.Cli.BundledSdks.props +++ b/build/Microsoft.DotNet.Cli.BundledSdks.props @@ -2,7 +2,7 @@ - + diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 8fcaccd95..92af87970 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -3,7 +3,7 @@ 15.1.0-preview-000523-01 2.0.0-rc3-61212-03 - 1.0.0-alpha-20170117-1 + 1.0.0-alpha-20170117-2 1.0.0-alpha-20170114-1-223 15.0.0-preview-20170106-08 1.0.0-beta1-20170108-83 diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 8e5ec2d2f..e3f47050e 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -41,7 +41,7 @@ 7.2.1 - 4.0.0-rc3 + 4.0.0-rc3-2215 $(CLI_MSBuild_Version) diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index ce5308d98..2bba88f6a 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -18,16 +18,16 @@ 1.0.1-beta-000933 - 4.0.0-rc3 + 4.0.0-rc3-2215 - 4.0.0-rc3 + 4.0.0-rc3-2215 - 4.0.0-rc3 + 4.0.0-rc3-2215 - 4.0.0-rc3 + 4.0.0-rc3-2215 $(CLI_MSBuild_Version) diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 5c0c36e2d..ac79c9a39 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -15,7 +15,7 @@ $(CLI_MSBuild_Version) - 4.0.0-rc3 + 4.0.0-rc3-2215 $(CLI_TestPlatform_Version) diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index ef70fa8e6..74f1a5a58 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -10,7 +10,7 @@ 1.0.3 - 4.0.0-rc3 + 4.0.0-rc3-2215 diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index c9d901f0d..38357b430 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -57,16 +57,16 @@ 4.1.1 - 4.0.0-rc3 + 4.0.0-rc3-2215 - 4.0.0-rc3 + 4.0.0-rc3-2215 - 4.0.0-rc3 + 4.0.0-rc3-2215 - 4.0.0-rc3 + 4.0.0-rc3-2215 4.4.0-beta8 From b020b6f6b13953e3d7c476f4e2c32def6e123805 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 17 Jan 2017 16:26:20 -0800 Subject: [PATCH 02/11] Adding a workaround for the build failure. --- .../dotnet-desktop-and-portable.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj b/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj index 8a1e7d530..68045ef60 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj @@ -19,6 +19,10 @@ + + + + From 7802b957d3eecba00ad9830b8178b217bcdc4a01 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Wed, 18 Jan 2017 10:17:37 -0800 Subject: [PATCH 03/11] Adding a second workaround for the build failure. Same fix as the other one though. --- .../DependencyContextFromTool.csproj | 3 +++ src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj index 6a76893df..54a21a60a 100755 --- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj +++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj @@ -18,6 +18,9 @@ 1.0.0-* + + + $(DefineConstants);RELEASE;TRACE true diff --git a/src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs b/src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs index a11e149cb..138256e9c 100644 --- a/src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs +++ b/src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs @@ -251,8 +251,6 @@ namespace Microsoft.DotNet.TestFramework var restoreArgs = new string[] { "restore", projFile.FullName }; var commandResult = Command.Create(_dotnetExeFile.FullName, restoreArgs) - .CaptureStdOut() - .CaptureStdErr() .Execute(); int exitCode = commandResult.ExitCode; @@ -267,6 +265,8 @@ namespace Microsoft.DotNet.TestFramework throw new Exception(message); } + + Console.WriteLine($"TestAsset Restore '{_assetName}' for {projFile.FullName} exited with {exitCode}"); } } From 872e96cfe2fe047d545de8215045d9e06c42a9b1 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Mon, 23 Jan 2017 20:21:58 -0800 Subject: [PATCH 04/11] Update version of Microsoft.AspNetCore.Mvc --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- .../commands/dotnet-new/CSharp_Web/$projectName$.csproj | 2 +- .../commands/dotnet-new/CSharp_Web1.1/$projectName$.csproj | 4 ++-- .../commands/dotnet-new/FSharp_Web/$projectName$.fsproj | 2 +- .../New3/GivenThatIWantANewAppWithSpecifiedType.cs | 4 ---- .../GivenThatTheUserIsRunningDotNetForTheFirstTime.cs | 4 ++-- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 5c7bfc396..98e6b47ad 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -6,6 +6,6 @@ 1.0.0-alpha-20170118-3 1.0.0-alpha-20170114-1-223 15.0.0-preview-20170106-08 - 1.0.0-beta1-20170108-83 + 1.0.0-beta1-20170123-94 diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj index 35d10cc4c..fe8e903d9 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj @@ -9,6 +9,6 @@ - + diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web1.1/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Web1.1/$projectName$.csproj index 17ceafd29..d47c2a3c4 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web1.1/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Web1.1/$projectName$.csproj @@ -6,9 +6,9 @@ - + - + diff --git a/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj b/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj index 6c1ac726b..5d64ddfc6 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj +++ b/src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj @@ -20,7 +20,7 @@ - + diff --git a/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs index b61565d83..e680f6270 100644 --- a/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs @@ -41,10 +41,6 @@ namespace Microsoft.DotNet.New3.Tests File.Copy("NuGet.tempaspnetpatch.config", Path.Combine(rootPath, "NuGet.Config")); } - string globalJsonPath = Path.Combine(rootPath, "global.json"); - Assert.True(File.Exists(globalJsonPath)); - Assert.Contains(Product.Version, File.ReadAllText(globalJsonPath)); - new TestCommand("dotnet") .WithWorkingDirectory(rootPath) .Execute($"restore") diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs index 9fe46af73..43b7fbe37 100644 --- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs +++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs @@ -82,7 +82,7 @@ A command is running to initially populate your local package cache, to improve { _nugetCacheFolder .Should() - .HaveFile($"{GetDotnetVersion()}.dotnetSentinel"); + .HaveFile($"{GetDotnetVersion()}.dotnetSentinel"); } [Fact] @@ -116,7 +116,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.2", "1.1.0" }); + .Should().HaveDirectories(new string[] { "1.0.2", "1.1.1" }); } private string GetDotnetVersion() From b31b2f429d1df8ae42a8f7eeedf2645f83c2edb9 Mon Sep 17 00:00:00 2001 From: Mike Lorbetske Date: Tue, 24 Jan 2017 00:43:47 -0800 Subject: [PATCH 05/11] Add NuGet feed --- NuGet.Config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.Config b/NuGet.Config index 559db7b79..64da20cde 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -3,6 +3,7 @@ + From ad8710decc8357e03a6c885b44bb40538318cefd Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 24 Jan 2017 01:14:35 -0800 Subject: [PATCH 06/11] SDK 20170123-1 (#5434) * Revert "Merge pull request #5362 from dotnet/ragrawal/updatesdktrial" This reverts commit 4e0b465093fd548a49a23b7e47c5c7ed286b0d7a. * bump SDK to 20170123-1 --- .../dotnet-dependency-tool-invoker.csproj | 2 +- .../dotnet-desktop-and-portable.csproj | 4 ---- .../DependencyContextFromTool.csproj | 3 --- build/Microsoft.DotNet.Cli.BundledSdks.props | 2 +- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.csproj | 8 ++++---- src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs | 4 ++-- src/redist/redist.csproj | 2 +- src/tool_nuget/tool_nuget.csproj | 2 +- .../Microsoft.DotNet.Cli.Utils.Tests.csproj | 8 ++++---- 11 files changed, 16 insertions(+), 23 deletions(-) diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj index d3257128f..a67ca793b 100644 --- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj +++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj @@ -24,7 +24,7 @@ 1.0.3 - 4.0.0-rc3-2215 + 4.0.0-rc3 $(SdkNugetVersion) diff --git a/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj b/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj index 68045ef60..8a1e7d530 100644 --- a/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj +++ b/TestAssets/TestPackages/dotnet-desktop-and-portable/dotnet-desktop-and-portable.csproj @@ -19,10 +19,6 @@ - - - - diff --git a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj index 54a21a60a..6a76893df 100755 --- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj +++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj @@ -18,9 +18,6 @@ 1.0.0-* - - - $(DefineConstants);RELEASE;TRACE true diff --git a/build/Microsoft.DotNet.Cli.BundledSdks.props b/build/Microsoft.DotNet.Cli.BundledSdks.props index 2898c04c4..baab92a0b 100644 --- a/build/Microsoft.DotNet.Cli.BundledSdks.props +++ b/build/Microsoft.DotNet.Cli.BundledSdks.props @@ -2,7 +2,7 @@ - + diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index 5c7bfc396..c470a66b3 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -3,7 +3,7 @@ 15.1.0-preview-000523-01 2.0.0-rc3-61212-03 - 1.0.0-alpha-20170118-3 + 1.0.0-alpha-20170123-1 1.0.0-alpha-20170114-1-223 15.0.0-preview-20170106-08 1.0.0-beta1-20170108-83 diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index e3f47050e..8e5ec2d2f 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -41,7 +41,7 @@ 7.2.1 - 4.0.0-rc3-2215 + 4.0.0-rc3 $(CLI_MSBuild_Version) diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 2bba88f6a..ce5308d98 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -18,16 +18,16 @@ 1.0.1-beta-000933 - 4.0.0-rc3-2215 + 4.0.0-rc3 - 4.0.0-rc3-2215 + 4.0.0-rc3 - 4.0.0-rc3-2215 + 4.0.0-rc3 - 4.0.0-rc3-2215 + 4.0.0-rc3 $(CLI_MSBuild_Version) diff --git a/src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs b/src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs index 138256e9c..a11e149cb 100644 --- a/src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs +++ b/src/Microsoft.DotNet.TestFramework/TestAssetInfo.cs @@ -251,6 +251,8 @@ namespace Microsoft.DotNet.TestFramework var restoreArgs = new string[] { "restore", projFile.FullName }; var commandResult = Command.Create(_dotnetExeFile.FullName, restoreArgs) + .CaptureStdOut() + .CaptureStdErr() .Execute(); int exitCode = commandResult.ExitCode; @@ -265,8 +267,6 @@ namespace Microsoft.DotNet.TestFramework throw new Exception(message); } - - Console.WriteLine($"TestAsset Restore '{_assetName}' for {projFile.FullName} exited with {exitCode}"); } } diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index ac79c9a39..5c0c36e2d 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -15,7 +15,7 @@ $(CLI_MSBuild_Version) - 4.0.0-rc3-2215 + 4.0.0-rc3 $(CLI_TestPlatform_Version) diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index 74f1a5a58..ef70fa8e6 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -10,7 +10,7 @@ 1.0.3 - 4.0.0-rc3-2215 + 4.0.0-rc3 diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index 38357b430..c9d901f0d 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -57,16 +57,16 @@ 4.1.1 - 4.0.0-rc3-2215 + 4.0.0-rc3 - 4.0.0-rc3-2215 + 4.0.0-rc3 - 4.0.0-rc3-2215 + 4.0.0-rc3 - 4.0.0-rc3-2215 + 4.0.0-rc3 4.4.0-beta8 From 131c63ae276cc253af56c63a798a33a1179d7af7 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 24 Jan 2017 02:30:24 -0800 Subject: [PATCH 07/11] Generate lzma nuget.config when needed --- NuGet.Config | 1 - .../Microsoft.DotNet.Cli.LzmaArchive.targets | 17 +++++++++++++++++ .../dotnet-cli-build/DotNetRestore.cs | 14 +++++++++++++- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index 64da20cde..559db7b79 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -3,7 +3,6 @@ - diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets index 06456c755..f267e7394 100644 --- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets +++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets @@ -67,15 +67,31 @@ + + + <configuration> + <packageSources> + <add key="configurable.source" value="%CLI_LZMA_PACKAGE_SOURCE%" /> + </packageSources> + </configuration> + + $(NuGetPackagesArchiveProject)/Nuget.config + + + + @@ -85,6 +101,7 @@ WorkingDirectory="$(NuGetPackagesArchiveProject)/Web1.1" /> diff --git a/build_projects/dotnet-cli-build/DotNetRestore.cs b/build_projects/dotnet-cli-build/DotNetRestore.cs index d3f1a2b4d..05e531dea 100644 --- a/build_projects/dotnet-cli-build/DotNetRestore.cs +++ b/build_projects/dotnet-cli-build/DotNetRestore.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build protected override string Args { - get { return $"{GetProjectPath()} {GetConfigFile()} {GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; } + get { return $"{GetProjectPath()} {GetConfigFile()} {GetSource()} {GetPackages()} {GetIgnoreMissingSources()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; } } public string ConfigFile { get; set; } @@ -26,6 +26,8 @@ namespace Microsoft.DotNet.Cli.Build public string Packages { get; set; } public bool SkipInvalidConfigurations { get; set; } + + public bool IgnoreMissingSources { get; set; } public string Runtime { get; set; } @@ -78,6 +80,16 @@ namespace Microsoft.DotNet.Cli.Build return null; } + + private string GetIgnoreMissingSources() + { + if (IgnoreMissingSources) + { + return "--ignore-failed-sources"; + } + + return null; + } private string GetRuntime() { From f4f325f1d51dba0c6795494e4b118fb353babb73 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Tue, 24 Jan 2017 02:36:04 -0800 Subject: [PATCH 08/11] Cleanup --- .../Microsoft.DotNet.Cli.LzmaArchive.targets | 2 -- build_projects/dotnet-cli-build/DotNetRestore.cs | 14 +------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets index f267e7394..a785e7b3c 100644 --- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets +++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets @@ -91,7 +91,6 @@ WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" /> @@ -101,7 +100,6 @@ WorkingDirectory="$(NuGetPackagesArchiveProject)/Web1.1" /> diff --git a/build_projects/dotnet-cli-build/DotNetRestore.cs b/build_projects/dotnet-cli-build/DotNetRestore.cs index 05e531dea..d3f1a2b4d 100644 --- a/build_projects/dotnet-cli-build/DotNetRestore.cs +++ b/build_projects/dotnet-cli-build/DotNetRestore.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build protected override string Args { - get { return $"{GetProjectPath()} {GetConfigFile()} {GetSource()} {GetPackages()} {GetIgnoreMissingSources()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; } + get { return $"{GetProjectPath()} {GetConfigFile()} {GetSource()} {GetPackages()} {GetSkipInvalidConfigurations()} {GetRuntime()} {GetAdditionalParameters()}"; } } public string ConfigFile { get; set; } @@ -26,8 +26,6 @@ namespace Microsoft.DotNet.Cli.Build public string Packages { get; set; } public bool SkipInvalidConfigurations { get; set; } - - public bool IgnoreMissingSources { get; set; } public string Runtime { get; set; } @@ -80,16 +78,6 @@ namespace Microsoft.DotNet.Cli.Build return null; } - - private string GetIgnoreMissingSources() - { - if (IgnoreMissingSources) - { - return "--ignore-failed-sources"; - } - - return null; - } private string GetRuntime() { From c849e8ba4ced2141416cd92073cae178ca42bdd9 Mon Sep 17 00:00:00 2001 From: Parallels Date: Thu, 26 Jan 2017 20:44:31 -0800 Subject: [PATCH 09/11] Updating the template engine version to a version that depends on 1.6.0 and updating our build scripts to allow for a commit count override. --- build/Microsoft.DotNet.Cli.DependencyVersions.props | 2 +- build/Microsoft.DotNet.Cli.Prepare.targets | 11 +++++++---- scripts/dockerrun.sh | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props index a064745ff..fec7fca24 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -6,6 +6,6 @@ 1.0.0-alpha-20170123-1 1.0.0-alpha-20170114-1-223 15.0.0-preview-20170106-08 - 1.0.0-beta1-20170123-94 + 1.0.0-beta1-20170126-99 diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets index 2b0282626..e1e4d6845 100644 --- a/build/Microsoft.DotNet.Cli.Prepare.targets +++ b/build/Microsoft.DotNet.Cli.Prepare.targets @@ -53,11 +53,8 @@ - + - - - @@ -69,6 +66,12 @@ + $(DefaultCommitCount) + + $(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount) + $(ReleaseSuffix)-$(CommitCount) + $(VersionMajor).$(VersionMinor).$(VersionPatch)-$(VersionSuffix) + $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg $(NugetVersion) diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh index 3b6b4133a..b478a2a10 100755 --- a/scripts/dockerrun.sh +++ b/scripts/dockerrun.sh @@ -133,5 +133,6 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \ -e CHECKSUM_STORAGE_ACCOUNT \ -e CHECKSUM_STORAGE_CONTAINER \ -e CLIBUILD_SKIP_TESTS \ + -e CommitCount \ $DOTNET_BUILD_CONTAINER_TAG \ $BUILD_COMMAND "$@" From ef95add8f66064eeb19899665d5a057af39a1867 Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 26 Jan 2017 20:55:41 -0800 Subject: [PATCH 10/11] Update the template engine to the correct build. --- 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 fec7fca24..11ba581fa 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -6,6 +6,6 @@ 1.0.0-alpha-20170123-1 1.0.0-alpha-20170114-1-223 15.0.0-preview-20170106-08 - 1.0.0-beta1-20170126-99 + 1.0.0-beta1-20170126-101 From 422b03cee48a516c2b888cd1bc33006218e413a3 Mon Sep 17 00:00:00 2001 From: Livar Date: Thu, 26 Jan 2017 22:55:16 -0800 Subject: [PATCH 11/11] Update the template engine version again. --- 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 11ba581fa..f2ad57ab5 100644 --- a/build/Microsoft.DotNet.Cli.DependencyVersions.props +++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props @@ -6,6 +6,6 @@ 1.0.0-alpha-20170123-1 1.0.0-alpha-20170114-1-223 15.0.0-preview-20170106-08 - 1.0.0-beta1-20170126-101 + 1.0.0-beta1-20170126-102