From ed9e3a720c863ec1ecdc40a7cd73f24b181f3869 Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Mon, 29 Aug 2016 23:15:51 -0700 Subject: [PATCH 01/21] Add class library template --- .../CSharp/.NETCore/ClassLibrary/Class1.cs | 3 + .../.NETCore/ClassLibrary/ClassLibrary.csproj | 69 ++++++++++++++++++ .../ClassLibrary/ClassLibrary.vstemplate | 24 ++++++ .../ClassLibrary/ConsoleApplication.png | Bin 0 -> 762 bytes .../ClassLibrary/ProjectTemplate.csproj | 17 +++++ .../ClassLibrary/project-json-template.json | 10 +++ .../CSharp/.NETCore/ClassLibrary/project.json | 11 +++ 7 files changed, 134 insertions(+) create mode 100644 src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/Class1.cs create mode 100644 src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.csproj create mode 100644 src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate create mode 100644 src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ConsoleApplication.png create mode 100644 src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj create mode 100644 src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project-json-template.json create mode 100644 src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project.json diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/Class1.cs b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/Class1.cs new file mode 100644 index 000000000000..df52691ee4fa --- /dev/null +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/Class1.cs @@ -0,0 +1,3 @@ +class Class1 +{ +} \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.csproj new file mode 100644 index 000000000000..91e17644b580 --- /dev/null +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.csproj @@ -0,0 +1,69 @@ + + + + + 14.0 + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ + + + + + Debug + AnyCPU + {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {0C52951F-4EEF-4F2F-B587-0BCF6004C459} + Library + ClassLibrary + v4.6 + false + false + false + false + true + false + false + false + false + false + false + true + true + prompt + 4 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + + + pdbonly + true + bin\Release\ + TRACE + + + + project.json.template + + + + + + Designer + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate new file mode 100644 index 000000000000..67f02495f00b --- /dev/null +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate @@ -0,0 +1,24 @@ + + + + + + ConsoleApplication.png + CSharp + 2.0 + 1 + 1 + Microsoft.CSharp.NETCore.ClassLibrary + true + true + ClassLibrary + true + true + + + + project.json.template + Class1.cs + + + \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ConsoleApplication.png b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ConsoleApplication.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e3ba6865dd5fd0321ae9b9e0252cdaedf6c2cc GIT binary patch literal 762 zcmV3_SteO=384?FUTik31moym!Q#%M=tv_hBwqOgXQ)@C-JJz;N7UQ5TrlK_% zL2E+5rJBK^v6Gm=MbhXX5=0Q12t|zdh1-w(8qyQ3Lm&7c=iHNg@A>|6P0-0^vpK92 zo3PH9k%y*f_*X=u(f=a?8v@KI!?UMz_*)k9x7&|25dGP-0pUCb)84cftGsK zKy~{2`k`sZA)M=~n5KshW?{8j;lJ%iEcQx00=zMuXEGUto`f)QV*-ndZ%_ew*5+{3 zCk5Iu4J0rVKq&N>4k)6yYiI=%&f#cd+SCLvlr$pYtin=ii3Y-&Q4mlf=1;v%E1C1| z!)`SJ%sY*+4yuchI^g%10;ZyN0XDlGUY`&50s-vUwG*4SG@z%qmurlTjpOc}sR}h9 z!lfA7-R|1j@I+@PJf49Hv%pT1bCGZum59Y+tN|&;bUKZ46uc3I!x0MLVFZIg#1|HL z8wtD95v(rh#BgzGjzMK<_M%N?r+5Q2B}B%=<6b+4ibq((f@>c1bllN&2#V1?!min zE7gjyY^UUagI0^>Eowvtk=_ZH0L*ZM)f|aL*z?kc#JIWK{+8drDlTQUY->`Q1Nsl# z2hdlh!s)og`Ple)euwzf2a$-tB*V_zvCru&-!b?2jAslcb@9)kfC+^#9bV1`RL7?~ spRD^^vGJqKDI=0XAt__ONt`S48-=SXa7p@rAOHXW07*qoM6N<$g8NEr4gdfE literal 0 HcmV?d00001 diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj new file mode 100644 index 000000000000..c22397d6466f --- /dev/null +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj @@ -0,0 +1,17 @@ + + + + + Exe + .NETCoreApp + v1.0 + + + + + + + + + + \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project-json-template.json b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project-json-template.json new file mode 100644 index 000000000000..8b37d18d797c --- /dev/null +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project-json-template.json @@ -0,0 +1,10 @@ +{ + "dependencies": { + "NETStandard.Library": "1.3", + "Microsoft.NETCore.Sdk": "$$buildversion$$" + }, + "frameworks": { + "netstandard1.3": { + } + } +} diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project.json b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project.json new file mode 100644 index 000000000000..9500d2f14887 --- /dev/null +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project.json @@ -0,0 +1,11 @@ +{ + "frameworks": { + "net46": {} + }, + "dependencies": { + "Microsoft.VSSDK.BuildTools": "15.0.25604-Preview4" + }, + "runtimes": { + "win": { } + } +} \ No newline at end of file From b5f3e67cb7994e7e30304086be7430e84f3a411c Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Mon, 29 Aug 2016 23:52:43 -0700 Subject: [PATCH 02/21] Adding class library template to the solution. --- core-sdk-templates.sln | 11 +++++++++-- .../CSharpTemplatesSetup/CSharpTemplatesSetup.csproj | 7 +++++++ .../source.extension.vsixmanifest | 1 + .../.NETCore/ClassLibrary/ProjectTemplate.csproj | 5 ++--- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/core-sdk-templates.sln b/core-sdk-templates.sln index 2bb38ce0fa79..bc6ddb9023bd 100644 --- a/core-sdk-templates.sln +++ b/core-sdk-templates.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.25624.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9CAEE03D-60F1-4E77-B25B-9CD8757E1F09}" ProjectSection(SolutionItems) = preProject @@ -40,6 +40,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpTemplatesSetup", "src EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication", "src\Templates\ProjectTemplates\CSharp\.NETCore\ConsoleApplication\ConsoleApplication.csproj", "{0C52951F-4EEF-4F2F-B587-0BCF6004C459}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassLibrary", "src\Templates\ProjectTemplates\CSharp\.NETCore\ClassLibrary\ClassLibrary.csproj", "{A103C9A3-C76C-4A48-B67C-695FD1CB2F15}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -54,6 +56,10 @@ Global {0C52951F-4EEF-4F2F-B587-0BCF6004C459}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C52951F-4EEF-4F2F-B587-0BCF6004C459}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C52951F-4EEF-4F2F-B587-0BCF6004C459}.Release|Any CPU.Build.0 = Release|Any CPU + {A103C9A3-C76C-4A48-B67C-695FD1CB2F15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A103C9A3-C76C-4A48-B67C-695FD1CB2F15}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A103C9A3-C76C-4A48-B67C-695FD1CB2F15}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A103C9A3-C76C-4A48-B67C-695FD1CB2F15}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -66,5 +72,6 @@ Global {57C097FA-72EB-4AB9-8E72-58ACDEB0F4A8} = {82D4E69F-8B61-4CC3-8AF1-11D02AAE99CF} {F535071D-F755-403A-AB63-468A0F547702} = {C86A71A6-9D35-436B-BBC5-0940041410F1} {0C52951F-4EEF-4F2F-B587-0BCF6004C459} = {57C097FA-72EB-4AB9-8E72-58ACDEB0F4A8} + {A103C9A3-C76C-4A48-B67C-695FD1CB2F15} = {57C097FA-72EB-4AB9-8E72-58ACDEB0F4A8} EndGlobalSection EndGlobal diff --git a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj index 6551c160625a..fe7a8efbc54f 100644 --- a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj +++ b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj @@ -51,6 +51,13 @@ false TemplateProjectOutputGroup%3b + + {a103c9a3-c76c-4a48-b67c-695fd1cb2f15} + ClassLibrary + ProjectTemplates + false + TemplateProjectOutputGroup%3b + diff --git a/src/Templates/CSharpTemplatesSetup/source.extension.vsixmanifest b/src/Templates/CSharpTemplatesSetup/source.extension.vsixmanifest index 1ea923e63bcb..d8a3dbd875a0 100644 --- a/src/Templates/CSharpTemplatesSetup/source.extension.vsixmanifest +++ b/src/Templates/CSharpTemplatesSetup/source.extension.vsixmanifest @@ -17,5 +17,6 @@ + diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj index c22397d6466f..1f8337fb4828 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj @@ -2,9 +2,8 @@ - Exe - .NETCoreApp - v1.0 + .NETStandard + v1.3 From 6f2311bafeb9d2c211338757e3ecdfdd019156b9 Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Tue, 30 Aug 2016 09:07:20 -0700 Subject: [PATCH 03/21] Update guid for Classlibrary project --- .../CSharp/.NETCore/ClassLibrary/ClassLibrary.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.csproj index 91e17644b580..066b9129ea99 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.csproj @@ -11,7 +11,7 @@ Debug AnyCPU {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {0C52951F-4EEF-4F2F-B587-0BCF6004C459} + {A103C9A3-C76C-4A48-B67C-695FD1CB2F15} Library ClassLibrary v4.6 From 47d332441473c2ee8945dd37759a15b2a13ba59f Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Tue, 30 Aug 2016 09:52:24 -0700 Subject: [PATCH 04/21] Add VB Console app template. --- core-sdk-templates.sln | 21 +++++- .../CSharpTemplatesSetup.csproj | 10 +-- .../source.extension.vsixmanifest | 4 +- ...brary.csproj => CSharpClassLibrary.csproj} | 2 +- ...csproj => CSharpConsoleApplication.csproj} | 4 +- .../ConsoleApplication/ConsoleApplication.png | Bin 0 -> 762 bytes .../ConsoleApplication.vstemplate | 24 ++++++ .../.NETCore/ConsoleApplication/Program.vb | 7 ++ .../ConsoleApplication/ProjectTemplate.vbproj | 17 +++++ .../VBConsoleApplication.csproj | 69 ++++++++++++++++++ .../project-json-template.json | 15 ++++ .../.NETCore/ConsoleApplication/project.json | 11 +++ 12 files changed, 170 insertions(+), 14 deletions(-) rename src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/{ClassLibrary.csproj => CSharpClassLibrary.csproj} (98%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/{ConsoleApplication.csproj => CSharpConsoleApplication.csproj} (96%) create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ConsoleApplication.png create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ConsoleApplication.vstemplate create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/Program.vb create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ProjectTemplate.vbproj create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VBConsoleApplication.csproj create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/project-json-template.json create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/project.json diff --git a/core-sdk-templates.sln b/core-sdk-templates.sln index bc6ddb9023bd..9963ab35d8c2 100644 --- a/core-sdk-templates.sln +++ b/core-sdk-templates.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.25624.1 +# Visual Studio 14 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9CAEE03D-60F1-4E77-B25B-9CD8757E1F09}" ProjectSection(SolutionItems) = preProject @@ -38,9 +38,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NETCore", ".NETCore", "{57 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpTemplatesSetup", "src\Templates\CSharpTemplatesSetup\CSharpTemplatesSetup.csproj", "{F535071D-F755-403A-AB63-468A0F547702}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication", "src\Templates\ProjectTemplates\CSharp\.NETCore\ConsoleApplication\ConsoleApplication.csproj", "{0C52951F-4EEF-4F2F-B587-0BCF6004C459}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpConsoleApplication", "src\Templates\ProjectTemplates\CSharp\.NETCore\ConsoleApplication\CSharpConsoleApplication.csproj", "{0C52951F-4EEF-4F2F-B587-0BCF6004C459}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassLibrary", "src\Templates\ProjectTemplates\CSharp\.NETCore\ClassLibrary\ClassLibrary.csproj", "{A103C9A3-C76C-4A48-B67C-695FD1CB2F15}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpClassLibrary", "src\Templates\ProjectTemplates\CSharp\.NETCore\ClassLibrary\CSharpClassLibrary.csproj", "{A103C9A3-C76C-4A48-B67C-695FD1CB2F15}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualBasic", "VisualBasic", "{98132BF6-2450-4753-B4E9-878F468E60BB}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NETCore", ".NETCore", "{E281FDCB-10B7-403C-84D4-EE4FF92845B9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBConsoleApplication", "src\Templates\ProjectTemplates\VisualBasic\.NETCore\ConsoleApplication\VBConsoleApplication.csproj", "{622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -60,6 +66,10 @@ Global {A103C9A3-C76C-4A48-B67C-695FD1CB2F15}.Debug|Any CPU.Build.0 = Debug|Any CPU {A103C9A3-C76C-4A48-B67C-695FD1CB2F15}.Release|Any CPU.ActiveCfg = Release|Any CPU {A103C9A3-C76C-4A48-B67C-695FD1CB2F15}.Release|Any CPU.Build.0 = Release|Any CPU + {622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -73,5 +83,8 @@ Global {F535071D-F755-403A-AB63-468A0F547702} = {C86A71A6-9D35-436B-BBC5-0940041410F1} {0C52951F-4EEF-4F2F-B587-0BCF6004C459} = {57C097FA-72EB-4AB9-8E72-58ACDEB0F4A8} {A103C9A3-C76C-4A48-B67C-695FD1CB2F15} = {57C097FA-72EB-4AB9-8E72-58ACDEB0F4A8} + {98132BF6-2450-4753-B4E9-878F468E60BB} = {1F16979A-2572-444B-9DD7-51D4289309DA} + {E281FDCB-10B7-403C-84D4-EE4FF92845B9} = {98132BF6-2450-4753-B4E9-878F468E60BB} + {622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51} = {E281FDCB-10B7-403C-84D4-EE4FF92845B9} EndGlobalSection EndGlobal diff --git a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj index fe7a8efbc54f..301fa1a0d19c 100644 --- a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj +++ b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj @@ -26,7 +26,7 @@ false true true - VisualStudio + VisualStudio prompt 4 @@ -44,16 +44,16 @@ TRACE - + {0c52951f-4eef-4f2f-b587-0bcf6004c459} - ConsoleApplication + CSharpConsoleApplication ProjectTemplates false TemplateProjectOutputGroup%3b - + {a103c9a3-c76c-4a48-b67c-695fd1cb2f15} - ClassLibrary + CSharpClassLibrary ProjectTemplates false TemplateProjectOutputGroup%3b diff --git a/src/Templates/CSharpTemplatesSetup/source.extension.vsixmanifest b/src/Templates/CSharpTemplatesSetup/source.extension.vsixmanifest index d8a3dbd875a0..7f007c03fd90 100644 --- a/src/Templates/CSharpTemplatesSetup/source.extension.vsixmanifest +++ b/src/Templates/CSharpTemplatesSetup/source.extension.vsixmanifest @@ -16,7 +16,7 @@ - - + + diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj similarity index 98% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.csproj rename to src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj index 066b9129ea99..9d6ac209a6aa 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj @@ -13,7 +13,7 @@ {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {A103C9A3-C76C-4A48-B67C-695FD1CB2F15} Library - ClassLibrary + CSharpClassLibrary v4.6 false false diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/ConsoleApplication.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/CSharpConsoleApplication.csproj similarity index 96% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/ConsoleApplication.csproj rename to src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/CSharpConsoleApplication.csproj index c4b1cbb89e21..dc1e94beeb4d 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/ConsoleApplication.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/CSharpConsoleApplication.csproj @@ -13,7 +13,7 @@ {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {0C52951F-4EEF-4F2F-B587-0BCF6004C459} Library - ConsoleApplication + CSharpConsoleApplication v4.6 false false @@ -46,7 +46,7 @@ - project.json.template + project.json.template diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ConsoleApplication.png b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ConsoleApplication.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e3ba6865dd5fd0321ae9b9e0252cdaedf6c2cc GIT binary patch literal 762 zcmV3_SteO=384?FUTik31moym!Q#%M=tv_hBwqOgXQ)@C-JJz;N7UQ5TrlK_% zL2E+5rJBK^v6Gm=MbhXX5=0Q12t|zdh1-w(8qyQ3Lm&7c=iHNg@A>|6P0-0^vpK92 zo3PH9k%y*f_*X=u(f=a?8v@KI!?UMz_*)k9x7&|25dGP-0pUCb)84cftGsK zKy~{2`k`sZA)M=~n5KshW?{8j;lJ%iEcQx00=zMuXEGUto`f)QV*-ndZ%_ew*5+{3 zCk5Iu4J0rVKq&N>4k)6yYiI=%&f#cd+SCLvlr$pYtin=ii3Y-&Q4mlf=1;v%E1C1| z!)`SJ%sY*+4yuchI^g%10;ZyN0XDlGUY`&50s-vUwG*4SG@z%qmurlTjpOc}sR}h9 z!lfA7-R|1j@I+@PJf49Hv%pT1bCGZum59Y+tN|&;bUKZ46uc3I!x0MLVFZIg#1|HL z8wtD95v(rh#BgzGjzMK<_M%N?r+5Q2B}B%=<6b+4ibq((f@>c1bllN&2#V1?!min zE7gjyY^UUagI0^>Eowvtk=_ZH0L*ZM)f|aL*z?kc#JIWK{+8drDlTQUY->`Q1Nsl# z2hdlh!s)og`Ple)euwzf2a$-tB*V_zvCru&-!b?2jAslcb@9)kfC+^#9bV1`RL7?~ spRD^^vGJqKDI=0XAt__ONt`S48-=SXa7p@rAOHXW07*qoM6N<$g8NEr4gdfE literal 0 HcmV?d00001 diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ConsoleApplication.vstemplate b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ConsoleApplication.vstemplate new file mode 100644 index 000000000000..c3cb14dbead9 --- /dev/null +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ConsoleApplication.vstemplate @@ -0,0 +1,24 @@ + + + + + + ConsoleApplication.png + VisualBasic + 2.0 + 1 + 1 + Microsoft.VisualBasic.NETCore.ConsoleApplication + true + true + ConsoleApplication + true + true + + + + project.json.template + Program.vb + + + \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/Program.vb b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/Program.vb new file mode 100644 index 000000000000..b769835d4817 --- /dev/null +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/Program.vb @@ -0,0 +1,7 @@ +Imports System + +Module Program + Sub Main(args As String()) + Console.WriteLine("Hello World!"); + End Sub +End Module \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ProjectTemplate.vbproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ProjectTemplate.vbproj new file mode 100644 index 000000000000..5e97f12c853c --- /dev/null +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ProjectTemplate.vbproj @@ -0,0 +1,17 @@ + + + + + Exe + .NETCoreApp + v1.0 + + + + + + + + + + \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VBConsoleApplication.csproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VBConsoleApplication.csproj new file mode 100644 index 000000000000..bf1a102580a4 --- /dev/null +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VBConsoleApplication.csproj @@ -0,0 +1,69 @@ + + + + + 14.0 + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ + + + + + Debug + AnyCPU + {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51} + Library + VBConsoleApplication + v4.6 + false + false + false + false + true + false + false + false + false + false + false + true + true + prompt + 4 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + + + pdbonly + true + bin\Release\ + TRACE + + + + project.json.template + + + + + + Designer + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/project-json-template.json b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/project-json-template.json new file mode 100644 index 000000000000..60a7348709ed --- /dev/null +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/project-json-template.json @@ -0,0 +1,15 @@ +{ + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0" + }, + "Microsoft.NETCore.Sdk": { + "version": "$$buildversion$$" + } + }, + "frameworks": { + "netcoreapp1.0": { + } + } +} diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/project.json b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/project.json new file mode 100644 index 000000000000..9500d2f14887 --- /dev/null +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/project.json @@ -0,0 +1,11 @@ +{ + "frameworks": { + "net46": {} + }, + "dependencies": { + "Microsoft.VSSDK.BuildTools": "15.0.25604-Preview4" + }, + "runtimes": { + "win": { } + } +} \ No newline at end of file From d0a42d66f7fc767c087cabc95799ace6ce0f21bf Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Tue, 30 Aug 2016 11:07:34 -0700 Subject: [PATCH 05/21] Add a VB templates setup project. --- .../VisualBasicTemplatesSetup.csproj | 61 +++++++++++++++++++ .../VisualBasicTemplatesSetup/project.json | 11 ++++ .../source.extension.vsixmanifest | 22 +++++++ 3 files changed, 94 insertions(+) create mode 100644 src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj create mode 100644 src/Templates/VisualBasicTemplatesSetup/project.json create mode 100644 src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest diff --git a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj new file mode 100644 index 000000000000..7b3c58719c61 --- /dev/null +++ b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj @@ -0,0 +1,61 @@ + + + + + 14.0 + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ + + + + + Debug + AnyCPU + {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {F535071D-F755-403A-AB63-468A0F547702} + Library + Microsoft.VisualStudio + Microsoft.VisualStudio.ProjectSystem.VisualBasic.Templates + false + RoslynDev + false + false + false + true + v4.6 + true + false + true + true + VisualStudio + prompt + 4 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + + + pdbonly + true + bin\Release\ + TRACE + + + + {0c52951f-4eef-4f2f-b587-0bcf6004c459} + VisualBasicConsoleApplication + ProjectTemplates + false + TemplateProjectOutputGroup%3b + + + + + + + + + \ No newline at end of file diff --git a/src/Templates/VisualBasicTemplatesSetup/project.json b/src/Templates/VisualBasicTemplatesSetup/project.json new file mode 100644 index 000000000000..3e283137a36b --- /dev/null +++ b/src/Templates/VisualBasicTemplatesSetup/project.json @@ -0,0 +1,11 @@ +{ + "frameworks": { + "net46": { } + }, + "dependencies": { + "Microsoft.VSSDK.BuildTools": "15.0.25604-Preview4" + }, + "runtimes": { + "win": { } + } +} \ No newline at end of file diff --git a/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest b/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest new file mode 100644 index 000000000000..ded251b99b79 --- /dev/null +++ b/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest @@ -0,0 +1,22 @@ + + + + + + Visual Basic templates + Visual Basic templates + + + + + + + + + + + + + + + From 4a06f5b1900f990c18429f8c506c24fe71d16d6a Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Tue, 30 Aug 2016 11:13:26 -0700 Subject: [PATCH 06/21] Add reference to templates setup project. --- core-sdk-templates.sln | 11 +++++++++-- .../VisualBasicTemplatesSetup.csproj | 16 ++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/core-sdk-templates.sln b/core-sdk-templates.sln index 9963ab35d8c2..5b45268bb634 100644 --- a/core-sdk-templates.sln +++ b/core-sdk-templates.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.25624.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9CAEE03D-60F1-4E77-B25B-9CD8757E1F09}" ProjectSection(SolutionItems) = preProject @@ -48,6 +48,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NETCore", ".NETCore", "{E2 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBConsoleApplication", "src\Templates\ProjectTemplates\VisualBasic\.NETCore\ConsoleApplication\VBConsoleApplication.csproj", "{622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualBasicTemplatesSetup", "src\Templates\VisualBasicTemplatesSetup\VisualBasicTemplatesSetup.csproj", "{2A82D3FA-4EBE-425C-A3C7-3DC207591E53}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -70,6 +72,10 @@ Global {622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}.Debug|Any CPU.Build.0 = Debug|Any CPU {622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}.Release|Any CPU.ActiveCfg = Release|Any CPU {622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}.Release|Any CPU.Build.0 = Release|Any CPU + {2A82D3FA-4EBE-425C-A3C7-3DC207591E53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A82D3FA-4EBE-425C-A3C7-3DC207591E53}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A82D3FA-4EBE-425C-A3C7-3DC207591E53}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A82D3FA-4EBE-425C-A3C7-3DC207591E53}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -86,5 +92,6 @@ Global {98132BF6-2450-4753-B4E9-878F468E60BB} = {1F16979A-2572-444B-9DD7-51D4289309DA} {E281FDCB-10B7-403C-84D4-EE4FF92845B9} = {98132BF6-2450-4753-B4E9-878F468E60BB} {622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51} = {E281FDCB-10B7-403C-84D4-EE4FF92845B9} + {2A82D3FA-4EBE-425C-A3C7-3DC207591E53} = {C86A71A6-9D35-436B-BBC5-0940041410F1} EndGlobalSection EndGlobal diff --git a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj index 7b3c58719c61..1dcc8e1b21a8 100644 --- a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj +++ b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj @@ -11,7 +11,7 @@ Debug AnyCPU {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {F535071D-F755-403A-AB63-468A0F547702} + {2A82D3FA-4EBE-425C-A3C7-3DC207591E53} Library Microsoft.VisualStudio Microsoft.VisualStudio.ProjectSystem.VisualBasic.Templates @@ -44,18 +44,18 @@ TRACE - - {0c52951f-4eef-4f2f-b587-0bcf6004c459} - VisualBasicConsoleApplication + + + + + + {622c1d9e-a9e1-422d-83df-ce5ce0aaaf51} + VBConsoleApplication ProjectTemplates false TemplateProjectOutputGroup%3b - - - - \ No newline at end of file From 871b45e324511ab3de97d2008c19d7ad29f792ec Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Tue, 30 Aug 2016 11:25:18 -0700 Subject: [PATCH 07/21] Fix up project name --- core-sdk-templates.sln | 2 +- ...pplication.csproj => VisualBasicConsoleApplication.csproj} | 2 +- .../VisualBasicTemplatesSetup.csproj | 4 ++-- .../VisualBasicTemplatesSetup/source.extension.vsixmanifest | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/{VBConsoleApplication.csproj => VisualBasicConsoleApplication.csproj} (98%) diff --git a/core-sdk-templates.sln b/core-sdk-templates.sln index 5b45268bb634..017073d55de9 100644 --- a/core-sdk-templates.sln +++ b/core-sdk-templates.sln @@ -46,7 +46,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualBasic", "VisualBasic" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NETCore", ".NETCore", "{E281FDCB-10B7-403C-84D4-EE4FF92845B9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBConsoleApplication", "src\Templates\ProjectTemplates\VisualBasic\.NETCore\ConsoleApplication\VBConsoleApplication.csproj", "{622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualBasicConsoleApplication", "src\Templates\ProjectTemplates\VisualBasic\.NETCore\ConsoleApplication\VisualBasicConsoleApplication.csproj", "{622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualBasicTemplatesSetup", "src\Templates\VisualBasicTemplatesSetup\VisualBasicTemplatesSetup.csproj", "{2A82D3FA-4EBE-425C-A3C7-3DC207591E53}" EndProject diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VBConsoleApplication.csproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VisualBasicConsoleApplication.csproj similarity index 98% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VBConsoleApplication.csproj rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VisualBasicConsoleApplication.csproj index bf1a102580a4..93a7cba5a2a4 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VBConsoleApplication.csproj +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VisualBasicConsoleApplication.csproj @@ -13,7 +13,7 @@ {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} {622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51} Library - VBConsoleApplication + VisualBasicConsoleApplication v4.6 false false diff --git a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj index 1dcc8e1b21a8..978d7080fd95 100644 --- a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj +++ b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj @@ -48,9 +48,9 @@ - + {622c1d9e-a9e1-422d-83df-ce5ce0aaaf51} - VBConsoleApplication + VisualBasicConsoleApplication ProjectTemplates false TemplateProjectOutputGroup%3b diff --git a/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest b/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest index ded251b99b79..a173c7ceaaff 100644 --- a/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest +++ b/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest @@ -17,6 +17,5 @@ - From 7c9a35d39698bc840f25bf057c7a7b8ffcf22df8 Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Wed, 31 Aug 2016 16:09:00 -0700 Subject: [PATCH 08/21] Set minimum vs version as 15.0 and update guid of VB template project. --- src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj | 2 +- .../CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj | 2 +- .../.NETCore/ConsoleApplication/CSharpConsoleApplication.csproj | 2 +- .../.NETCore/ConsoleApplication/ProjectTemplate.vbproj | 2 +- .../ConsoleApplication/VisualBasicConsoleApplication.csproj | 2 +- .../VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj | 2 +- .../VisualBasicTemplatesSetup/source.extension.vsixmanifest | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj index 301fa1a0d19c..c9032abd3eb9 100644 --- a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj +++ b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj @@ -2,7 +2,7 @@ - 14.0 + 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj index 9d6ac209a6aa..85f01726be7e 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj @@ -2,7 +2,7 @@ - 14.0 + 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/CSharpConsoleApplication.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/CSharpConsoleApplication.csproj index dc1e94beeb4d..8b35165de574 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/CSharpConsoleApplication.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/CSharpConsoleApplication.csproj @@ -2,7 +2,7 @@ - 14.0 + 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ProjectTemplate.vbproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ProjectTemplate.vbproj index 5e97f12c853c..07d3d0ba8393 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ProjectTemplate.vbproj +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ProjectTemplate.vbproj @@ -8,7 +8,7 @@ - + diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VisualBasicConsoleApplication.csproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VisualBasicConsoleApplication.csproj index 93a7cba5a2a4..dd49c281abed 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VisualBasicConsoleApplication.csproj +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VisualBasicConsoleApplication.csproj @@ -2,7 +2,7 @@ - 14.0 + 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ diff --git a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj index 978d7080fd95..7a700f0c481d 100644 --- a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj +++ b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj @@ -2,7 +2,7 @@ - 14.0 + 15.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ diff --git a/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest b/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest index a173c7ceaaff..131531f10cd7 100644 --- a/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest +++ b/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest @@ -2,7 +2,7 @@ - + Visual Basic templates Visual Basic templates From e0976f0c576a73c1d6f409f88603bdb1fd8354b1 Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Wed, 31 Aug 2016 17:07:04 -0700 Subject: [PATCH 09/21] Add VB class library templates. --- core-sdk-templates.sln | 9 ++- .../.NETCore/ClassLibrary/Class1.vb | 2 + .../ClassLibrary/ClassLibrary.vstemplate | 24 ++++++ .../ClassLibrary/ConsoleApplication.png | Bin 0 -> 762 bytes .../ClassLibrary/ProjectTemplate.vbproj | 16 ++++ .../VisualBasicClassLibrary.csproj | 69 ++++++++++++++++++ .../ClassLibrary/project-json-template.json | 10 +++ .../.NETCore/ClassLibrary/project.json | 11 +++ .../VisualBasicTemplatesSetup.csproj | 7 ++ .../source.extension.vsixmanifest | 1 + 10 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/Class1.vb create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ConsoleApplication.png create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ProjectTemplate.vbproj create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project-json-template.json create mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project.json diff --git a/core-sdk-templates.sln b/core-sdk-templates.sln index 017073d55de9..3f4afb95a255 100644 --- a/core-sdk-templates.sln +++ b/core-sdk-templates.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.25624.1 +VisualStudioVersion = 15.0.25630.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9CAEE03D-60F1-4E77-B25B-9CD8757E1F09}" ProjectSection(SolutionItems) = preProject @@ -50,6 +50,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualBasicConsoleApplicati EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualBasicTemplatesSetup", "src\Templates\VisualBasicTemplatesSetup\VisualBasicTemplatesSetup.csproj", "{2A82D3FA-4EBE-425C-A3C7-3DC207591E53}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualBasicClassLibrary", "src\Templates\ProjectTemplates\VisualBasic\.NETCore\ClassLibrary\VisualBasicClassLibrary.csproj", "{DCDD8266-D269-46BD-B563-E4D4B811A5B1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -76,6 +78,10 @@ Global {2A82D3FA-4EBE-425C-A3C7-3DC207591E53}.Debug|Any CPU.Build.0 = Debug|Any CPU {2A82D3FA-4EBE-425C-A3C7-3DC207591E53}.Release|Any CPU.ActiveCfg = Release|Any CPU {2A82D3FA-4EBE-425C-A3C7-3DC207591E53}.Release|Any CPU.Build.0 = Release|Any CPU + {DCDD8266-D269-46BD-B563-E4D4B811A5B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DCDD8266-D269-46BD-B563-E4D4B811A5B1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DCDD8266-D269-46BD-B563-E4D4B811A5B1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DCDD8266-D269-46BD-B563-E4D4B811A5B1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -93,5 +99,6 @@ Global {E281FDCB-10B7-403C-84D4-EE4FF92845B9} = {98132BF6-2450-4753-B4E9-878F468E60BB} {622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51} = {E281FDCB-10B7-403C-84D4-EE4FF92845B9} {2A82D3FA-4EBE-425C-A3C7-3DC207591E53} = {C86A71A6-9D35-436B-BBC5-0940041410F1} + {DCDD8266-D269-46BD-B563-E4D4B811A5B1} = {E281FDCB-10B7-403C-84D4-EE4FF92845B9} EndGlobalSection EndGlobal diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/Class1.vb b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/Class1.vb new file mode 100644 index 000000000000..43db1e3be93c --- /dev/null +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/Class1.vb @@ -0,0 +1,2 @@ +Class Class1 +End Class \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate new file mode 100644 index 000000000000..cdc4b849bcae --- /dev/null +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate @@ -0,0 +1,24 @@ + + + + + + ConsoleApplication.png + VisualBasic + 2.0 + 1 + 1 + Microsoft.VisualBasic.NETCore.ClassLibrary + true + true + ClassLibrary + true + true + + + + project.json.template + Class1.vb + + + \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ConsoleApplication.png b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ConsoleApplication.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e3ba6865dd5fd0321ae9b9e0252cdaedf6c2cc GIT binary patch literal 762 zcmV3_SteO=384?FUTik31moym!Q#%M=tv_hBwqOgXQ)@C-JJz;N7UQ5TrlK_% zL2E+5rJBK^v6Gm=MbhXX5=0Q12t|zdh1-w(8qyQ3Lm&7c=iHNg@A>|6P0-0^vpK92 zo3PH9k%y*f_*X=u(f=a?8v@KI!?UMz_*)k9x7&|25dGP-0pUCb)84cftGsK zKy~{2`k`sZA)M=~n5KshW?{8j;lJ%iEcQx00=zMuXEGUto`f)QV*-ndZ%_ew*5+{3 zCk5Iu4J0rVKq&N>4k)6yYiI=%&f#cd+SCLvlr$pYtin=ii3Y-&Q4mlf=1;v%E1C1| z!)`SJ%sY*+4yuchI^g%10;ZyN0XDlGUY`&50s-vUwG*4SG@z%qmurlTjpOc}sR}h9 z!lfA7-R|1j@I+@PJf49Hv%pT1bCGZum59Y+tN|&;bUKZ46uc3I!x0MLVFZIg#1|HL z8wtD95v(rh#BgzGjzMK<_M%N?r+5Q2B}B%=<6b+4ibq((f@>c1bllN&2#V1?!min zE7gjyY^UUagI0^>Eowvtk=_ZH0L*ZM)f|aL*z?kc#JIWK{+8drDlTQUY->`Q1Nsl# z2hdlh!s)og`Ple)euwzf2a$-tB*V_zvCru&-!b?2jAslcb@9)kfC+^#9bV1`RL7?~ spRD^^vGJqKDI=0XAt__ONt`S48-=SXa7p@rAOHXW07*qoM6N<$g8NEr4gdfE literal 0 HcmV?d00001 diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ProjectTemplate.vbproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ProjectTemplate.vbproj new file mode 100644 index 000000000000..c67e515f3e70 --- /dev/null +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ProjectTemplate.vbproj @@ -0,0 +1,16 @@ + + + + + .NETStandard + v1.3 + + + + + + + + + + \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj new file mode 100644 index 000000000000..7441430d8b51 --- /dev/null +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj @@ -0,0 +1,69 @@ + + + + + 15.0 + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.props'))\ + + + + + Debug + AnyCPU + {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {DCDD8266-D269-46BD-B563-E4D4B811A5B1} + Library + VisualBasicClassLibrary + v4.6 + false + false + false + false + true + false + false + false + false + false + false + true + true + prompt + 4 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + + + pdbonly + true + bin\Release\ + TRACE + + + + project.json.template + + + + + + Designer + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project-json-template.json b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project-json-template.json new file mode 100644 index 000000000000..8b37d18d797c --- /dev/null +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project-json-template.json @@ -0,0 +1,10 @@ +{ + "dependencies": { + "NETStandard.Library": "1.3", + "Microsoft.NETCore.Sdk": "$$buildversion$$" + }, + "frameworks": { + "netstandard1.3": { + } + } +} diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project.json b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project.json new file mode 100644 index 000000000000..9500d2f14887 --- /dev/null +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project.json @@ -0,0 +1,11 @@ +{ + "frameworks": { + "net46": {} + }, + "dependencies": { + "Microsoft.VSSDK.BuildTools": "15.0.25604-Preview4" + }, + "runtimes": { + "win": { } + } +} \ No newline at end of file diff --git a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj index 7a700f0c481d..3c8ed678dfb2 100644 --- a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj +++ b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj @@ -48,6 +48,13 @@ + + {dcdd8266-d269-46bd-b563-e4d4b811a5b1} + VisualBasicClassLibrary + ProjectTemplates + false + TemplateProjectOutputGroup%3b + {622c1d9e-a9e1-422d-83df-ce5ce0aaaf51} VisualBasicConsoleApplication diff --git a/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest b/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest index 131531f10cd7..76fdca28b4dd 100644 --- a/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest +++ b/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest @@ -17,5 +17,6 @@ + From 4096e44ccdb1514915efa4c1827bfea83b00fe22 Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Wed, 31 Aug 2016 17:12:11 -0700 Subject: [PATCH 10/21] Remove templates from core-sdk.sln so that it can open cleanly on VS2015. --- core-sdk.sln | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/core-sdk.sln b/core-sdk.sln index 4152e0edfce2..b0212bfb2cd7 100644 --- a/core-sdk.sln +++ b/core-sdk.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tasks", "Tasks", "{1FEED16D-E07D-47C1-BB4C-56CD9F42B53B}" EndProject @@ -53,18 +53,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{0C13 build\Targets\Templates.Imports.targets = build\Targets\Templates.Imports.targets EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{C86A71A6-9D35-436B-BBC5-0940041410F1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectTemplates", "ProjectTemplates", "{1F16979A-2572-444B-9DD7-51D4289309DA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{82D4E69F-8B61-4CC3-8AF1-11D02AAE99CF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NETCore", ".NETCore", "{57C097FA-72EB-4AB9-8E72-58ACDEB0F4A8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpTemplatesSetup", "src\Templates\CSharpTemplatesSetup\CSharpTemplatesSetup.csproj", "{F535071D-F755-403A-AB63-468A0F547702}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication", "src\Templates\ProjectTemplates\CSharp\.NETCore\ConsoleApplication\ConsoleApplication.csproj", "{0C52951F-4EEF-4F2F-B587-0BCF6004C459}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.NETCore.Build.Tests", "test\Microsoft.NETCore.Build.Tests\Microsoft.NETCore.Build.Tests.csproj", "{EC640B7E-332E-40A2-BB6E-5B7EC788F315}" EndProject Global @@ -95,10 +83,6 @@ Global {94F9B889-635A-48A7-A0CB-BAE5D6C9A91A}.Release|Any CPU.Build.0 = Release|Any CPU {98883ACD-BE3A-4533-953D-1BE25981BA02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {98883ACD-BE3A-4533-953D-1BE25981BA02}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {F535071D-F755-403A-AB63-468A0F547702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F535071D-F755-403A-AB63-468A0F547702}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C52951F-4EEF-4F2F-B587-0BCF6004C459}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C52951F-4EEF-4F2F-B587-0BCF6004C459}.Release|Any CPU.ActiveCfg = Release|Any CPU {EC640B7E-332E-40A2-BB6E-5B7EC788F315}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EC640B7E-332E-40A2-BB6E-5B7EC788F315}.Debug|Any CPU.Build.0 = Debug|Any CPU {EC640B7E-332E-40A2-BB6E-5B7EC788F315}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -117,11 +101,6 @@ Global {94F9B889-635A-48A7-A0CB-BAE5D6C9A91A} = {3B295650-6CBF-486F-9E25-F96EE03B7CAE} {98883ACD-BE3A-4533-953D-1BE25981BA02} = {3B295650-6CBF-486F-9E25-F96EE03B7CAE} {0C1312C0-0A29-4EB2-8294-6D1C54D78F61} = {50A89C27-BA35-44B2-AC57-E54551791C64} - {1F16979A-2572-444B-9DD7-51D4289309DA} = {C86A71A6-9D35-436B-BBC5-0940041410F1} - {82D4E69F-8B61-4CC3-8AF1-11D02AAE99CF} = {1F16979A-2572-444B-9DD7-51D4289309DA} - {57C097FA-72EB-4AB9-8E72-58ACDEB0F4A8} = {82D4E69F-8B61-4CC3-8AF1-11D02AAE99CF} - {F535071D-F755-403A-AB63-468A0F547702} = {C86A71A6-9D35-436B-BBC5-0940041410F1} - {0C52951F-4EEF-4F2F-B587-0BCF6004C459} = {57C097FA-72EB-4AB9-8E72-58ACDEB0F4A8} {EC640B7E-332E-40A2-BB6E-5B7EC788F315} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} EndGlobalSection EndGlobal From 36efb92bce8737b6b0f2be206a65f2ee37366eca Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Wed, 7 Sep 2016 13:41:11 -0700 Subject: [PATCH 11/21] Add C#\VB specific props\targets and get VB console app to build. --- .../Microsoft.NETCore.Build.Tasks.csproj | 12 +++++++++ .../Microsoft.NETCore.Sdk.CSharp.props | 25 +++++++++++++++++ .../Microsoft.NETCore.Sdk.CSharp.targets | 13 +++++++++ .../Microsoft.NETCore.Sdk.VisualBasic.props | 26 ++++++++++++++++++ .../Microsoft.NETCore.Sdk.VisualBasic.targets | 27 +++++++++++++++++++ .../Microsoft.NETCore.Sdk.props | 8 +++--- .../Microsoft.NETCore.Sdk.targets | 4 ++- 7 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.props create mode 100644 src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.targets create mode 100644 src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.props create mode 100644 src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.targets diff --git a/src/Tasks/Microsoft.NETCore.Build.Tasks/Microsoft.NETCore.Build.Tasks.csproj b/src/Tasks/Microsoft.NETCore.Build.Tasks/Microsoft.NETCore.Build.Tasks.csproj index 8e7a23caa5cc..4d98f116c22d 100644 --- a/src/Tasks/Microsoft.NETCore.Build.Tasks/Microsoft.NETCore.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NETCore.Build.Tasks/Microsoft.NETCore.Build.Tasks.csproj @@ -36,6 +36,18 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest diff --git a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.props b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.props new file mode 100644 index 000000000000..eef308a0b3fd --- /dev/null +++ b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.props @@ -0,0 +1,25 @@ + + + + + 4 + $(NoWarn);1701 + + + DEBUG;TRACE + + + TRACE + + + diff --git a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.targets b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.targets new file mode 100644 index 000000000000..c1521cda9857 --- /dev/null +++ b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.targets @@ -0,0 +1,13 @@ + + + diff --git a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.props b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.props new file mode 100644 index 000000000000..0906bb5a31e1 --- /dev/null +++ b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.props @@ -0,0 +1,26 @@ + + + + + Embed + + + + true + true + + + true + + + diff --git a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.targets b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.targets new file mode 100644 index 000000000000..ca6b62c393cb --- /dev/null +++ b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.targets @@ -0,0 +1,27 @@ + + + + + + ChangeExtensionOfOutputAssembly;$(TargetsTriggeredByCompilation) + + + + + + + + \ No newline at end of file diff --git a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.props b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.props index 82ec7b690826..e0d16b68b4b1 100644 --- a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.props +++ b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.props @@ -28,8 +28,6 @@ Copyright (c) .NET Foundation. All rights reserved. AnyCPU prompt - 4 - $(NoWarn);1701 @@ -37,13 +35,11 @@ Copyright (c) .NET Foundation. All rights reserved. full false bin\Debug\ - DEBUG;TRACE pdbonly true bin\Release\ - TRACE @@ -80,5 +76,7 @@ Copyright (c) .NET Foundation. All rights reserved. $(DotnetHostPath) - + + + diff --git a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.targets b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.targets index 338fbca5adcd..e6be221bb605 100644 --- a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.targets +++ b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.targets @@ -137,5 +137,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + + + From 0e9e79a2588a16009843315cbc7d41c8d82835d9 Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Wed, 7 Sep 2016 13:48:44 -0700 Subject: [PATCH 12/21] Rename classlibrary icon --- .../.NETCore/ClassLibrary/CSharpClassLibrary.csproj | 2 +- .../{ConsoleApplication.png => ClassLibrary.png} | Bin .../.NETCore/ClassLibrary/ClassLibrary.vstemplate | 2 +- .../{ConsoleApplication.png => ClassLibrary.png} | Bin .../.NETCore/ClassLibrary/ClassLibrary.vstemplate | 2 +- .../ClassLibrary/VisualBasicClassLibrary.csproj | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/{ConsoleApplication.png => ClassLibrary.png} (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/{ConsoleApplication.png => ClassLibrary.png} (100%) diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj index 85f01726be7e..06185c28061e 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj @@ -59,7 +59,7 @@ - + diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ConsoleApplication.png b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.png similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ConsoleApplication.png rename to src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.png diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate index 67f02495f00b..a5b03f880d76 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate @@ -3,7 +3,7 @@ - ConsoleApplication.png + ClassLibrary.png CSharp 2.0 1 diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ConsoleApplication.png b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.png similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ConsoleApplication.png rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.png diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate index cdc4b849bcae..16f22b73936b 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate @@ -3,7 +3,7 @@ - ConsoleApplication.png + ClassLibrary.png VisualBasic 2.0 1 diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj index 7441430d8b51..a217c611cad5 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj @@ -59,7 +59,7 @@ - + From 90346b33313927584cdfbe052085a7a5b304033c Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Wed, 7 Sep 2016 14:10:22 -0700 Subject: [PATCH 13/21] Include OutputType=Library in the props file. --- .../build/netstandard1.0/Microsoft.NETCore.Sdk.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.props b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.props index 86615fe3c8f1..ed059e5e8dd5 100644 --- a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.props +++ b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.props @@ -17,6 +17,7 @@ Copyright (c) .NET Foundation. All rights reserved. + Library Debug AnyCPU From b5766e0318d8e7086827178f6a983f4d4bfad089 Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Wed, 7 Sep 2016 15:38:34 -0700 Subject: [PATCH 14/21] Fix NoWarn to just include default value. --- .../build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.props b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.props index eef308a0b3fd..f490df0f11b8 100644 --- a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.props +++ b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.CSharp.props @@ -13,7 +13,7 @@ Copyright (c) .NET Foundation. All rights reserved. 4 - $(NoWarn);1701 + 1701 DEBUG;TRACE From 88d90503f720c8f0bcaaa369b3403e4a83e5a0d9 Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Wed, 7 Sep 2016 17:54:23 -0700 Subject: [PATCH 15/21] Move the VB project selector the VB template vsix --- .../CSharpTemplatesSetup/ProjectSelector.pkgdef | 2 -- .../ProjectSelector.pkgdef | 2 ++ .../VisualBasicTemplatesSetup.csproj | 14 ++++++++++---- .../source.extension.vsixmanifest | 1 + 4 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 src/Templates/VisualBasicTemplatesSetup/ProjectSelector.pkgdef diff --git a/src/Templates/CSharpTemplatesSetup/ProjectSelector.pkgdef b/src/Templates/CSharpTemplatesSetup/ProjectSelector.pkgdef index 86f7a847888e..b516c78d61a0 100644 --- a/src/Templates/CSharpTemplatesSetup/ProjectSelector.pkgdef +++ b/src/Templates/CSharpTemplatesSetup/ProjectSelector.pkgdef @@ -1,4 +1,2 @@ [$RootKey$\Projects\{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}] "ProjectSelector"="{3DCC42E7-4611-46AC-8EA8-6F1E9B3D917F}" -[$RootKey$\Projects\{f184b08f-c81c-45f6-a57f-5abd9991f28f}] -"ProjectSelector"="{50018B05-93AB-437C-A9EB-F4AD12FF83DD}" diff --git a/src/Templates/VisualBasicTemplatesSetup/ProjectSelector.pkgdef b/src/Templates/VisualBasicTemplatesSetup/ProjectSelector.pkgdef new file mode 100644 index 000000000000..ec7bad9039ba --- /dev/null +++ b/src/Templates/VisualBasicTemplatesSetup/ProjectSelector.pkgdef @@ -0,0 +1,2 @@ +[$RootKey$\Projects\{f184b08f-c81c-45f6-a57f-5abd9991f28f}] +"ProjectSelector"="{50018B05-93AB-437C-A9EB-F4AD12FF83DD}" diff --git a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj index 3c8ed678dfb2..44536af2ab20 100644 --- a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj +++ b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj @@ -43,10 +43,6 @@ bin\Release\ TRACE - - - - {dcdd8266-d269-46bd-b563-e4d4b811a5b1} @@ -63,6 +59,16 @@ TemplateProjectOutputGroup%3b + + + + + + + true + PreserveNewest + + \ No newline at end of file diff --git a/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest b/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest index 76fdca28b4dd..f07e9115a235 100644 --- a/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest +++ b/src/Templates/VisualBasicTemplatesSetup/source.extension.vsixmanifest @@ -16,6 +16,7 @@ + From bce28150939892e115fb6e0911fad98e44ef6805 Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Thu, 8 Sep 2016 09:24:38 -0700 Subject: [PATCH 16/21] Remove extra characters from target name --- .../CSharpTemplatesSetup/CSharpTemplatesSetup.csproj | 4 ++-- .../VisualBasicTemplatesSetup.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj index b0171541dabd..60c5ea14456c 100644 --- a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj +++ b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj @@ -49,14 +49,14 @@ CSharpConsoleApplication ProjectTemplates false - TemplateProjectOutputGroup%3b + TemplateProjectOutputGroup {a103c9a3-c76c-4a48-b67c-695fd1cb2f15} CSharpClassLibrary ProjectTemplates false - TemplateProjectOutputGroup%3b + TemplateProjectOutputGroup diff --git a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj index 44536af2ab20..ee6d7e882f22 100644 --- a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj +++ b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj @@ -49,14 +49,14 @@ VisualBasicClassLibrary ProjectTemplates false - TemplateProjectOutputGroup%3b + TemplateProjectOutputGroup {622c1d9e-a9e1-422d-83df-ce5ce0aaaf51} VisualBasicConsoleApplication ProjectTemplates false - TemplateProjectOutputGroup%3b + TemplateProjectOutputGroup From c85d3c18d946623dc59802d829dbc8bdb0121da3 Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Thu, 8 Sep 2016 10:21:20 -0700 Subject: [PATCH 17/21] Update class library templates - target netstandard16, change name, description, icon and sort order. --- .../ClassLibrary/CSharpClassLibrary.csproj | 3 --- .../CSharp/.NETCore/ClassLibrary/Class1.cs | 9 +++++++-- .../CSharp/.NETCore/ClassLibrary/ClassLibrary.png | Bin 762 -> 0 bytes .../.NETCore/ClassLibrary/ClassLibrary.vstemplate | 8 ++++---- .../.NETCore/ClassLibrary/ProjectTemplate.csproj | 2 +- .../ClassLibrary/project-json-template.json | 4 ++-- .../VisualBasic/.NETCore/ClassLibrary/Class1.vb | 3 ++- .../.NETCore/ClassLibrary/ClassLibrary.png | Bin 762 -> 0 bytes .../.NETCore/ClassLibrary/ClassLibrary.vstemplate | 8 ++++---- .../.NETCore/ClassLibrary/ProjectTemplate.vbproj | 2 +- .../ClassLibrary/VisualBasicClassLibrary.csproj | 3 --- .../ClassLibrary/project-json-template.json | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.png delete mode 100644 src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.png diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj index 06185c28061e..167c7fcd1745 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj @@ -58,9 +58,6 @@ - - - diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/Class1.cs b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/Class1.cs index df52691ee4fa..58c2c359b3d8 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/Class1.cs +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/Class1.cs @@ -1,3 +1,8 @@ -class Class1 +using System; + +namespace $safeprojectname$ { -} \ No newline at end of file + public class Class1 + { + } +} diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.png b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.png deleted file mode 100644 index d7e3ba6865dd5fd0321ae9b9e0252cdaedf6c2cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 762 zcmV3_SteO=384?FUTik31moym!Q#%M=tv_hBwqOgXQ)@C-JJz;N7UQ5TrlK_% zL2E+5rJBK^v6Gm=MbhXX5=0Q12t|zdh1-w(8qyQ3Lm&7c=iHNg@A>|6P0-0^vpK92 zo3PH9k%y*f_*X=u(f=a?8v@KI!?UMz_*)k9x7&|25dGP-0pUCb)84cftGsK zKy~{2`k`sZA)M=~n5KshW?{8j;lJ%iEcQx00=zMuXEGUto`f)QV*-ndZ%_ew*5+{3 zCk5Iu4J0rVKq&N>4k)6yYiI=%&f#cd+SCLvlr$pYtin=ii3Y-&Q4mlf=1;v%E1C1| z!)`SJ%sY*+4yuchI^g%10;ZyN0XDlGUY`&50s-vUwG*4SG@z%qmurlTjpOc}sR}h9 z!lfA7-R|1j@I+@PJf49Hv%pT1bCGZum59Y+tN|&;bUKZ46uc3I!x0MLVFZIg#1|HL z8wtD95v(rh#BgzGjzMK<_M%N?r+5Q2B}B%=<6b+4ibq((f@>c1bllN&2#V1?!min zE7gjyY^UUagI0^>Eowvtk=_ZH0L*ZM)f|aL*z?kc#JIWK{+8drDlTQUY->`Q1Nsl# z2hdlh!s)og`Ple)euwzf2a$-tB*V_zvCru&-!b?2jAslcb@9)kfC+^#9bV1`RL7?~ spRD^^vGJqKDI=0XAt__ONt`S48-=SXa7p@rAOHXW07*qoM6N<$g8NEr4gdfE diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate index a5b03f880d76..4f705e34dc90 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate @@ -1,12 +1,12 @@ - - - ClassLibrary.png + + + CSharp 2.0 - 1 + 21 1 Microsoft.CSharp.NETCore.ClassLibrary true diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj index 1f8337fb4828..9f0ec993f8cf 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj @@ -3,7 +3,7 @@ .NETStandard - v1.3 + v1.6 diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project-json-template.json b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project-json-template.json index 8b37d18d797c..fe557e8292bb 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project-json-template.json +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project-json-template.json @@ -1,10 +1,10 @@ { "dependencies": { - "NETStandard.Library": "1.3", + "NETStandard.Library": "1.6", "Microsoft.NETCore.Sdk": "$$buildversion$$" }, "frameworks": { - "netstandard1.3": { + "netstandard1.6": { } } } diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/Class1.vb b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/Class1.vb index 43db1e3be93c..bac5ac273460 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/Class1.vb +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/Class1.vb @@ -1,2 +1,3 @@ -Class Class1 +Public Class Class1 + End Class \ No newline at end of file diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.png b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.png deleted file mode 100644 index d7e3ba6865dd5fd0321ae9b9e0252cdaedf6c2cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 762 zcmV3_SteO=384?FUTik31moym!Q#%M=tv_hBwqOgXQ)@C-JJz;N7UQ5TrlK_% zL2E+5rJBK^v6Gm=MbhXX5=0Q12t|zdh1-w(8qyQ3Lm&7c=iHNg@A>|6P0-0^vpK92 zo3PH9k%y*f_*X=u(f=a?8v@KI!?UMz_*)k9x7&|25dGP-0pUCb)84cftGsK zKy~{2`k`sZA)M=~n5KshW?{8j;lJ%iEcQx00=zMuXEGUto`f)QV*-ndZ%_ew*5+{3 zCk5Iu4J0rVKq&N>4k)6yYiI=%&f#cd+SCLvlr$pYtin=ii3Y-&Q4mlf=1;v%E1C1| z!)`SJ%sY*+4yuchI^g%10;ZyN0XDlGUY`&50s-vUwG*4SG@z%qmurlTjpOc}sR}h9 z!lfA7-R|1j@I+@PJf49Hv%pT1bCGZum59Y+tN|&;bUKZ46uc3I!x0MLVFZIg#1|HL z8wtD95v(rh#BgzGjzMK<_M%N?r+5Q2B}B%=<6b+4ibq((f@>c1bllN&2#V1?!min zE7gjyY^UUagI0^>Eowvtk=_ZH0L*ZM)f|aL*z?kc#JIWK{+8drDlTQUY->`Q1Nsl# z2hdlh!s)og`Ple)euwzf2a$-tB*V_zvCru&-!b?2jAslcb@9)kfC+^#9bV1`RL7?~ spRD^^vGJqKDI=0XAt__ONt`S48-=SXa7p@rAOHXW07*qoM6N<$g8NEr4gdfE diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate index 16f22b73936b..ce962003dab8 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate @@ -1,12 +1,12 @@ - - - ClassLibrary.png + + + VisualBasic 2.0 - 1 + 21 1 Microsoft.VisualBasic.NETCore.ClassLibrary true diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ProjectTemplate.vbproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ProjectTemplate.vbproj index c67e515f3e70..c4d5fe798d30 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ProjectTemplate.vbproj +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ProjectTemplate.vbproj @@ -3,7 +3,7 @@ .NETStandard - v1.3 + v1.6 diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj index a217c611cad5..a556f3faf371 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj @@ -58,9 +58,6 @@ - - - diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project-json-template.json b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project-json-template.json index 8b37d18d797c..fe557e8292bb 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project-json-template.json +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project-json-template.json @@ -1,10 +1,10 @@ { "dependencies": { - "NETStandard.Library": "1.3", + "NETStandard.Library": "1.6", "Microsoft.NETCore.Sdk": "$$buildversion$$" }, "frameworks": { - "netstandard1.3": { + "netstandard1.6": { } } } From 9c713e0b2da9f5c0e3737ebb91e28c2db4bbea94 Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Thu, 8 Sep 2016 12:14:43 -0700 Subject: [PATCH 18/21] Change directory names to match project names so that dotnet restore generates the targets\props that match the project name --- .../CSharpClassLibrary.csproj | 0 .../{ClassLibrary => CSharpClassLibrary}/Class1.cs | 0 .../ClassLibrary.vstemplate | 0 .../ProjectTemplate.csproj | 0 .../project-json-template.json | 0 .../project.json | 0 .../CSharpConsoleApplication.csproj | 0 .../ConsoleApplication.png | Bin .../ConsoleApplication.vstemplate | 0 .../Program.cs | 0 .../ProjectTemplate.csproj | 0 .../project-json-template.json | 0 .../project.json | 0 .../Class1.vb | 0 .../ClassLibrary.vstemplate | 0 .../ProjectTemplate.vbproj | 0 .../VisualBasicClassLibrary.csproj | 0 .../project-json-template.json | 0 .../project.json | 0 .../ConsoleApplication.png | Bin .../ConsoleApplication.vstemplate | 0 .../Program.vb | 0 .../ProjectTemplate.vbproj | 0 .../VisualBasicConsoleApplication.csproj | 0 .../project-json-template.json | 0 .../project.json | 0 26 files changed, 0 insertions(+), 0 deletions(-) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ClassLibrary => CSharpClassLibrary}/CSharpClassLibrary.csproj (100%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ClassLibrary => CSharpClassLibrary}/Class1.cs (100%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ClassLibrary => CSharpClassLibrary}/ClassLibrary.vstemplate (100%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ClassLibrary => CSharpClassLibrary}/ProjectTemplate.csproj (100%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ClassLibrary => CSharpClassLibrary}/project-json-template.json (100%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ClassLibrary => CSharpClassLibrary}/project.json (100%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ConsoleApplication => CSharpConsoleApplication}/CSharpConsoleApplication.csproj (100%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ConsoleApplication => CSharpConsoleApplication}/ConsoleApplication.png (100%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ConsoleApplication => CSharpConsoleApplication}/ConsoleApplication.vstemplate (100%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ConsoleApplication => CSharpConsoleApplication}/Program.cs (100%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ConsoleApplication => CSharpConsoleApplication}/ProjectTemplate.csproj (100%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ConsoleApplication => CSharpConsoleApplication}/project-json-template.json (100%) rename src/Templates/ProjectTemplates/CSharp/.NETCore/{ConsoleApplication => CSharpConsoleApplication}/project.json (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ClassLibrary => VisualBasicClassLibrary}/Class1.vb (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ClassLibrary => VisualBasicClassLibrary}/ClassLibrary.vstemplate (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ClassLibrary => VisualBasicClassLibrary}/ProjectTemplate.vbproj (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ClassLibrary => VisualBasicClassLibrary}/VisualBasicClassLibrary.csproj (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ClassLibrary => VisualBasicClassLibrary}/project-json-template.json (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ClassLibrary => VisualBasicClassLibrary}/project.json (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ConsoleApplication => VisualBasicConsoleApplication}/ConsoleApplication.png (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ConsoleApplication => VisualBasicConsoleApplication}/ConsoleApplication.vstemplate (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ConsoleApplication => VisualBasicConsoleApplication}/Program.vb (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ConsoleApplication => VisualBasicConsoleApplication}/ProjectTemplate.vbproj (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ConsoleApplication => VisualBasicConsoleApplication}/VisualBasicConsoleApplication.csproj (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ConsoleApplication => VisualBasicConsoleApplication}/project-json-template.json (100%) rename src/Templates/ProjectTemplates/VisualBasic/.NETCore/{ConsoleApplication => VisualBasicConsoleApplication}/project.json (100%) diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/CSharpClassLibrary.csproj similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/CSharpClassLibrary.csproj rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/CSharpClassLibrary.csproj diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/Class1.cs b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/Class1.cs similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/Class1.cs rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/Class1.cs diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/ClassLibrary.vstemplate similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ClassLibrary.vstemplate rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/ClassLibrary.vstemplate diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/ProjectTemplate.csproj similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/ProjectTemplate.csproj rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/ProjectTemplate.csproj diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project-json-template.json b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/project-json-template.json similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project-json-template.json rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/project-json-template.json diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project.json b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/project.json similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ClassLibrary/project.json rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/project.json diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/CSharpConsoleApplication.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/CSharpConsoleApplication.csproj similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/CSharpConsoleApplication.csproj rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/CSharpConsoleApplication.csproj diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/ConsoleApplication.png b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/ConsoleApplication.png similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/ConsoleApplication.png rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/ConsoleApplication.png diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/ConsoleApplication.vstemplate b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/ConsoleApplication.vstemplate similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/ConsoleApplication.vstemplate rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/ConsoleApplication.vstemplate diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/Program.cs b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/Program.cs similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/Program.cs rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/Program.cs diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/ProjectTemplate.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/ProjectTemplate.csproj similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/ProjectTemplate.csproj rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/ProjectTemplate.csproj diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/project-json-template.json b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/project-json-template.json similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/project-json-template.json rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/project-json-template.json diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/project.json b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/project.json similarity index 100% rename from src/Templates/ProjectTemplates/CSharp/.NETCore/ConsoleApplication/project.json rename to src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpConsoleApplication/project.json diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/Class1.vb b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/Class1.vb similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/Class1.vb rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/Class1.vb diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/ClassLibrary.vstemplate similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ClassLibrary.vstemplate rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/ClassLibrary.vstemplate diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ProjectTemplate.vbproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/ProjectTemplate.vbproj similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/ProjectTemplate.vbproj rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/ProjectTemplate.vbproj diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/VisualBasicClassLibrary.csproj similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/VisualBasicClassLibrary.csproj rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/VisualBasicClassLibrary.csproj diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project-json-template.json b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/project-json-template.json similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project-json-template.json rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/project-json-template.json diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project.json b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/project.json similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ClassLibrary/project.json rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/project.json diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ConsoleApplication.png b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/ConsoleApplication.png similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ConsoleApplication.png rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/ConsoleApplication.png diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ConsoleApplication.vstemplate b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/ConsoleApplication.vstemplate similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ConsoleApplication.vstemplate rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/ConsoleApplication.vstemplate diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/Program.vb b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/Program.vb similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/Program.vb rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/Program.vb diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ProjectTemplate.vbproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/ProjectTemplate.vbproj similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/ProjectTemplate.vbproj rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/ProjectTemplate.vbproj diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VisualBasicConsoleApplication.csproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/VisualBasicConsoleApplication.csproj similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/VisualBasicConsoleApplication.csproj rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/VisualBasicConsoleApplication.csproj diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/project-json-template.json b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/project-json-template.json similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/project-json-template.json rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/project-json-template.json diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/project.json b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/project.json similarity index 100% rename from src/Templates/ProjectTemplates/VisualBasic/.NETCore/ConsoleApplication/project.json rename to src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicConsoleApplication/project.json From e9c611f0a616a3e8add1ec4f9abce657b48cd66a Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Thu, 8 Sep 2016 12:20:04 -0700 Subject: [PATCH 19/21] Fix up paths in solution and project files. --- core-sdk-templates.sln | 8 ++++---- .../CSharpTemplatesSetup/CSharpTemplatesSetup.csproj | 4 ++-- .../VisualBasicTemplatesSetup.csproj | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core-sdk-templates.sln b/core-sdk-templates.sln index 3f4afb95a255..58c3a6068922 100644 --- a/core-sdk-templates.sln +++ b/core-sdk-templates.sln @@ -38,19 +38,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NETCore", ".NETCore", "{57 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpTemplatesSetup", "src\Templates\CSharpTemplatesSetup\CSharpTemplatesSetup.csproj", "{F535071D-F755-403A-AB63-468A0F547702}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpConsoleApplication", "src\Templates\ProjectTemplates\CSharp\.NETCore\ConsoleApplication\CSharpConsoleApplication.csproj", "{0C52951F-4EEF-4F2F-B587-0BCF6004C459}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpConsoleApplication", "src\Templates\ProjectTemplates\CSharp\.NETCore\CSharpConsoleApplication\CSharpConsoleApplication.csproj", "{0C52951F-4EEF-4F2F-B587-0BCF6004C459}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpClassLibrary", "src\Templates\ProjectTemplates\CSharp\.NETCore\ClassLibrary\CSharpClassLibrary.csproj", "{A103C9A3-C76C-4A48-B67C-695FD1CB2F15}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpClassLibrary", "src\Templates\ProjectTemplates\CSharp\.NETCore\CSharpClassLibrary\CSharpClassLibrary.csproj", "{A103C9A3-C76C-4A48-B67C-695FD1CB2F15}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualBasic", "VisualBasic", "{98132BF6-2450-4753-B4E9-878F468E60BB}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NETCore", ".NETCore", "{E281FDCB-10B7-403C-84D4-EE4FF92845B9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualBasicConsoleApplication", "src\Templates\ProjectTemplates\VisualBasic\.NETCore\ConsoleApplication\VisualBasicConsoleApplication.csproj", "{622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualBasicConsoleApplication", "src\Templates\ProjectTemplates\VisualBasic\.NETCore\VisualBasicConsoleApplication\VisualBasicConsoleApplication.csproj", "{622C1D9E-A9E1-422D-83DF-CE5CE0AAAF51}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualBasicTemplatesSetup", "src\Templates\VisualBasicTemplatesSetup\VisualBasicTemplatesSetup.csproj", "{2A82D3FA-4EBE-425C-A3C7-3DC207591E53}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualBasicClassLibrary", "src\Templates\ProjectTemplates\VisualBasic\.NETCore\ClassLibrary\VisualBasicClassLibrary.csproj", "{DCDD8266-D269-46BD-B563-E4D4B811A5B1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualBasicClassLibrary", "src\Templates\ProjectTemplates\VisualBasic\.NETCore\VisualBasicClassLibrary\VisualBasicClassLibrary.csproj", "{DCDD8266-D269-46BD-B563-E4D4B811A5B1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj index 60c5ea14456c..fac4794f904e 100644 --- a/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj +++ b/src/Templates/CSharpTemplatesSetup/CSharpTemplatesSetup.csproj @@ -44,14 +44,14 @@ TRACE - + {0c52951f-4eef-4f2f-b587-0bcf6004c459} CSharpConsoleApplication ProjectTemplates false TemplateProjectOutputGroup - + {a103c9a3-c76c-4a48-b67c-695fd1cb2f15} CSharpClassLibrary ProjectTemplates diff --git a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj index ee6d7e882f22..e59b7a3a92d7 100644 --- a/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj +++ b/src/Templates/VisualBasicTemplatesSetup/VisualBasicTemplatesSetup.csproj @@ -44,14 +44,14 @@ TRACE - + {dcdd8266-d269-46bd-b563-e4d4b811a5b1} VisualBasicClassLibrary ProjectTemplates false - TemplateProjectOutputGroup + TemplateProjectOutputGroup - + {622c1d9e-a9e1-422d-83df-ce5ce0aaaf51} VisualBasicConsoleApplication ProjectTemplates @@ -68,7 +68,7 @@ true PreserveNewest - + \ No newline at end of file From a93e7a15063d578731d0b5f10f32bd096724cbca Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Thu, 8 Sep 2016 12:21:43 -0700 Subject: [PATCH 20/21] Make class libraries target netstandard 1.4 --- .../CSharp/.NETCore/CSharpClassLibrary/ProjectTemplate.csproj | 2 +- .../.NETCore/CSharpClassLibrary/project-json-template.json | 2 +- .../.NETCore/VisualBasicClassLibrary/ProjectTemplate.vbproj | 2 +- .../.NETCore/VisualBasicClassLibrary/project-json-template.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/ProjectTemplate.csproj b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/ProjectTemplate.csproj index 9f0ec993f8cf..f549242870ce 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/ProjectTemplate.csproj +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/ProjectTemplate.csproj @@ -3,7 +3,7 @@ .NETStandard - v1.6 + v1.4 diff --git a/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/project-json-template.json b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/project-json-template.json index fe557e8292bb..d83d32f1eb86 100644 --- a/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/project-json-template.json +++ b/src/Templates/ProjectTemplates/CSharp/.NETCore/CSharpClassLibrary/project-json-template.json @@ -4,7 +4,7 @@ "Microsoft.NETCore.Sdk": "$$buildversion$$" }, "frameworks": { - "netstandard1.6": { + "netstandard1.4": { } } } diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/ProjectTemplate.vbproj b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/ProjectTemplate.vbproj index c4d5fe798d30..e2427f33543a 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/ProjectTemplate.vbproj +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/ProjectTemplate.vbproj @@ -3,7 +3,7 @@ .NETStandard - v1.6 + v1.4 diff --git a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/project-json-template.json b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/project-json-template.json index fe557e8292bb..d83d32f1eb86 100644 --- a/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/project-json-template.json +++ b/src/Templates/ProjectTemplates/VisualBasic/.NETCore/VisualBasicClassLibrary/project-json-template.json @@ -4,7 +4,7 @@ "Microsoft.NETCore.Sdk": "$$buildversion$$" }, "frameworks": { - "netstandard1.6": { + "netstandard1.4": { } } } From 81206b8057fe0abbc14c44e7e178f71576fd09db Mon Sep 17 00:00:00 2001 From: Srivatsn Narayanan Date: Thu, 8 Sep 2016 12:28:17 -0700 Subject: [PATCH 21/21] Add a bug reference to the TODO. --- .../netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.targets b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.targets index ca6b62c393cb..a15a3834fd25 100644 --- a/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.targets +++ b/src/Tasks/Microsoft.NETCore.Build.Tasks/build/netstandard1.0/Microsoft.NETCore.Sdk.VisualBasic.targets @@ -14,6 +14,7 @@ Copyright (c) .NET Foundation. All rights reserved. ChangeExtensionOfOutputAssembly;$(TargetsTriggeredByCompilation)