From 72d44b4f9fd8535d2acdd613ddb3c681d34b5278 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 19 Sep 2019 13:12:27 -0700 Subject: [PATCH 01/13] Update to newer SDK --- global.json | 4 ++-- src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index f48e76cc34..5049b12eb7 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "5.0.100-alpha1-013788" + "version": "5.0.100-alpha1-014696" }, "tools": { - "dotnet": "5.0.100-alpha1-013788", + "dotnet": "5.0.100-alpha1-014696", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCoreAppRuntimeVersion)" diff --git a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs index b87cdf0897..5e65ce90ae 100644 --- a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs @@ -90,7 +90,7 @@ namespace Templates.Test.Helpers /* * The templates are indexed by path, for example: - &USERPROFILE%\.templateengine\dotnetcli\v5.0.100-alpha1-013788\packages\nunit3.dotnetnew.template.1.6.1.nupkg + &USERPROFILE%\.templateengine\dotnetcli\v5.0.100-alpha1-014696\packages\nunit3.dotnetnew.template.1.6.1.nupkg Templates: NUnit 3 Test Project (nunit) C# NUnit 3 Test Item (nunit-test) C# @@ -99,7 +99,7 @@ namespace Templates.Test.Helpers NUnit 3 Test Project (nunit) VB NUnit 3 Test Item (nunit-test) VB Uninstall Command: - dotnet new -u &USERPROFILE%\.templateengine\dotnetcli\v5.0.100-alpha1-013788\packages\nunit3.dotnetnew.template.1.6.1.nupkg + dotnet new -u &USERPROFILE%\.templateengine\dotnetcli\v5.0.100-alpha1-014696\packages\nunit3.dotnetnew.template.1.6.1.nupkg * We don't want to construct this path so we'll rely on dotnet new --uninstall --help to construct the uninstall command. */ From 2f643cd689bbf55cc547ceacb6dd3a55f0df0243 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 19 Sep 2019 15:08:25 -0700 Subject: [PATCH 02/13] Add NoWarns --- Directory.Build.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index 76414deaaa..6c6a89c481 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -53,6 +53,10 @@ $(WarningsNotAsErrors);CS1591 $(WarningsNotAsErrors);xUnit1004 + + $(NoWarn);NU5131 + + $(NoWarn);NU5048 From 42b6004f709d6846b2f35d6df2fced667993af05 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 19 Sep 2019 15:09:30 -0700 Subject: [PATCH 03/13] Revert changes to templatePackageInstaller.cs --- src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs index 5e65ce90ae..b87cdf0897 100644 --- a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs @@ -90,7 +90,7 @@ namespace Templates.Test.Helpers /* * The templates are indexed by path, for example: - &USERPROFILE%\.templateengine\dotnetcli\v5.0.100-alpha1-014696\packages\nunit3.dotnetnew.template.1.6.1.nupkg + &USERPROFILE%\.templateengine\dotnetcli\v5.0.100-alpha1-013788\packages\nunit3.dotnetnew.template.1.6.1.nupkg Templates: NUnit 3 Test Project (nunit) C# NUnit 3 Test Item (nunit-test) C# @@ -99,7 +99,7 @@ namespace Templates.Test.Helpers NUnit 3 Test Project (nunit) VB NUnit 3 Test Item (nunit-test) VB Uninstall Command: - dotnet new -u &USERPROFILE%\.templateengine\dotnetcli\v5.0.100-alpha1-014696\packages\nunit3.dotnetnew.template.1.6.1.nupkg + dotnet new -u &USERPROFILE%\.templateengine\dotnetcli\v5.0.100-alpha1-013788\packages\nunit3.dotnetnew.template.1.6.1.nupkg * We don't want to construct this path so we'll rely on dotnet new --uninstall --help to construct the uninstall command. */ From c7acbaa28f066b85767950baaf00bc5974bcf727 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 20 Sep 2019 13:17:41 -0700 Subject: [PATCH 04/13] Add vNext SDK Workaround --- eng/Workarounds.targets | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets index bb01d5f38b..35e2d7262e 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -1,11 +1,15 @@ + + + 5.0 + - + @@ -25,6 +29,20 @@ + + + + + + From 351419ba48486211da42c8434dfba68b114c466e Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 20 Sep 2019 13:38:58 -0700 Subject: [PATCH 05/13] Test - remove KnownAppHostPack workaround --- eng/Workarounds.targets | 5 ----- 1 file changed, 5 deletions(-) diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets index 35e2d7262e..2b6d4c48d5 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -31,11 +31,6 @@ - Date: Fri, 20 Sep 2019 13:41:48 -0700 Subject: [PATCH 06/13] Undo last change --- eng/Workarounds.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets index 2b6d4c48d5..35e2d7262e 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -31,6 +31,11 @@ + Date: Fri, 20 Sep 2019 13:47:19 -0700 Subject: [PATCH 07/13] Try workaround in d.b.t --- Directory.Build.targets | 14 ++++++++++++++ eng/Workarounds.targets | 20 +------------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index f5b217f365..a84790df69 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -111,6 +111,20 @@ + + + + + + diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets index 35e2d7262e..bb01d5f38b 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -1,15 +1,11 @@ - - - 5.0 - - + @@ -29,20 +25,6 @@ - - - - - - From be42a1fe2371be1ac1887c2a8e50503d80c4d01c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 20 Sep 2019 14:00:07 -0700 Subject: [PATCH 08/13] Test - remove KnownAppHostPack --- Directory.Build.targets | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index a84790df69..002f03c45c 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -113,11 +113,6 @@ - Date: Fri, 20 Sep 2019 14:09:30 -0700 Subject: [PATCH 09/13] Short circuit when ItemGroup is epty --- Directory.Build.targets | 9 --------- eng/Workarounds.targets | 20 +++++++++++++++++++- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 002f03c45c..f5b217f365 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -111,15 +111,6 @@ - - - - - diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets index bb01d5f38b..53844147d8 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -1,11 +1,15 @@ + + + 5.0 + - + @@ -25,6 +29,20 @@ + + + + + + From 43a1ba9aba4d0f0ec80046819348c406037cc152 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 20 Sep 2019 15:15:06 -0700 Subject: [PATCH 10/13] Fix parens, FrameworkRef --- eng/Workarounds.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets index 53844147d8..1e030df504 100644 --- a/eng/Workarounds.targets +++ b/eng/Workarounds.targets @@ -9,7 +9,7 @@ The web sdk adds an implicit framework reference. This removes it until we can update our build to use framework references. --> - + @@ -34,12 +34,12 @@ From 3ad85f984d8b7e2e4ddab38958863babac496c18 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 25 Sep 2019 15:32:42 -0700 Subject: [PATCH 11/13] Add conditions to workarounds in TemplateTests.props --- .../test/Infrastructure/TemplateTests.props.in | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in index e012ba42b7..a24f6a4e70 100644 --- a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in +++ b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in @@ -9,12 +9,14 @@ - - - - - Date: Thu, 26 Sep 2019 14:12:03 -0700 Subject: [PATCH 12/13] Fix typo --- .../test/Infrastructure/TemplateTests.props.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in index a24f6a4e70..f9a35bce12 100644 --- a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in +++ b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in @@ -9,14 +9,14 @@ Date: Mon, 7 Oct 2019 14:58:07 -0700 Subject: [PATCH 13/13] Remove TargetFramework metadata from workaround --- .../test/Infrastructure/TemplateTests.props.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in index f9a35bce12..1d3fb7bb2a 100644 --- a/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in +++ b/src/ProjectTemplates/test/Infrastructure/TemplateTests.props.in @@ -9,16 +9,13 @@