diff --git a/MvcScaffolding/MvcScaffolding.csproj b/MvcScaffolding/MvcScaffolding.csproj index 452b7e2..f8c904c 100644 --- a/MvcScaffolding/MvcScaffolding.csproj +++ b/MvcScaffolding/MvcScaffolding.csproj @@ -10,7 +10,7 @@ Properties MvcScaffolding MvcScaffolding - v4.5 + v4.8 512 SAK SAK @@ -241,7 +241,7 @@ - + diff --git a/MvcScaffolding/MvcScaffolding.nuspec b/MvcScaffolding/MvcScaffolding.nuspec index beae90b..aa34748 100644 --- a/MvcScaffolding/MvcScaffolding.nuspec +++ b/MvcScaffolding/MvcScaffolding.nuspec @@ -1,14 +1,14 @@  - MvcScaffolding.VS2017 - 1.0.2 - Scott Hanselman, Steve Sanderson, David Anderson, Cigano Morrison Mendez - MvcScaffolding (Fix VS2017) + MvcScaffolding.VS2019 + 1.0.3 + Scott Hanselman, Steve Sanderson, David Anderson, Cigano Morrison Mendez, Pablo Tôndolo de Vargas + MvcScaffolding (Fix VS2019) A fast and customizable way to add controllers, views, and other items to your ASP.NET MVC application A fast and customizable way to add controllers, views, and other items to your ASP.NET MVC application - + diff --git a/Scaffolding.sln b/Scaffolding.sln index 67ad6f5..d20ccec 100644 --- a/Scaffolding.sln +++ b/Scaffolding.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29411.108 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "T4Scaffolding", "T4Scaffolding", "{2E67D06D-78A8-43B3-8CE1-202AD0B8325F}" EndProject @@ -60,33 +60,7 @@ Global {412A692C-C66A-4272-9FCD-C78DDE98712A} = {2E67D06D-78A8-43B3-8CE1-202AD0B8325F} {58D14702-323C-4461-AB37-95061EC758ED} = {2E67D06D-78A8-43B3-8CE1-202AD0B8325F} EndGlobalSection - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 7 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://vvmspds.gene.com:8080/tfs/se - SccLocalPath0 = . - SccProjectUniqueName1 = T4Scaffolding\\T4Scaffolding.csproj - SccProjectTopLevelParentUniqueName1 = Scaffolding.sln - SccProjectName1 = T4Scaffolding - SccLocalPath1 = T4Scaffolding - SccProjectUniqueName2 = T4Scaffolding.Test\\T4Scaffolding.Test.csproj - SccProjectTopLevelParentUniqueName2 = Scaffolding.sln - SccProjectName2 = T4Scaffolding.Test - SccLocalPath2 = T4Scaffolding.Test - SccProjectUniqueName3 = MvcScaffolding\\MvcScaffolding.csproj - SccProjectName3 = MvcScaffolding - SccLocalPath3 = MvcScaffolding - SccProjectUniqueName4 = LinqToSqlScaffolding\\LinqToSqlScaffolding.csproj - SccProjectTopLevelParentUniqueName4 = Scaffolding.sln - SccProjectName4 = LinqToSqlScaffolding - SccLocalPath4 = LinqToSqlScaffolding - SccProjectUniqueName5 = T4Scaffolding.NuGetServices\\T4Scaffolding.NuGetServices.csproj - SccProjectTopLevelParentUniqueName5 = Scaffolding.sln - SccProjectName5 = T4Scaffolding.NuGetServices - SccLocalPath5 = T4Scaffolding.NuGetServices - SccProjectUniqueName6 = T4Scaffolding.Core\\T4Scaffolding.Core.csproj - SccProjectTopLevelParentUniqueName6 = Scaffolding.sln - SccProjectName6 = T4Scaffolding.Core - SccLocalPath6 = T4Scaffolding.Core + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {86A04F0F-07DF-4B5A-A715-C576BDEE65E3} EndGlobalSection EndGlobal diff --git a/T4Scaffolding.Core/Core/Configuration/XmlScaffoldingConfigStore.cs b/T4Scaffolding.Core/Core/Configuration/XmlScaffoldingConfigStore.cs index 1c1b713..84c7a2e 100644 --- a/T4Scaffolding.Core/Core/Configuration/XmlScaffoldingConfigStore.cs +++ b/T4Scaffolding.Core/Core/Configuration/XmlScaffoldingConfigStore.cs @@ -81,7 +81,7 @@ private void SaveProjectConfig(Project project, XmlScaffoldingConfig config) private void SaveConfigToFile(string filename, XmlScaffoldingConfig config) { _solutionManager.EnsureCheckedOutIfExists(filename); - using (var writer = new XmlTextWriter(filename, Encoding.UTF8) { Formatting = Formatting.Indented }) { + using (var writer = new XmlTextWriter(filename, new UTF8Encoding(true)) { Formatting = Formatting.Indented }) { var serializer = new XmlSerializer(typeof(XmlScaffoldingConfig)); serializer.Serialize(writer, config); } diff --git a/T4Scaffolding.Core/Core/FileSystem/DefaultFileSystem.cs b/T4Scaffolding.Core/Core/FileSystem/DefaultFileSystem.cs index 4235773..28ae0f4 100644 --- a/T4Scaffolding.Core/Core/FileSystem/DefaultFileSystem.cs +++ b/T4Scaffolding.Core/Core/FileSystem/DefaultFileSystem.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.IO; +using System.Text; namespace T4Scaffolding.Core.FileSystem { @@ -27,7 +28,7 @@ public string ReadAllText(string path) public void WriteAllText(string path, string textContents) { - File.WriteAllText(path, textContents); + File.WriteAllText(path, textContents, new UTF8Encoding(true)); } public IEnumerable FindFiles(string path, string pattern, bool includeSubdirectories) diff --git a/T4Scaffolding.Core/Core/Templating/DynamicTextTemplatingEngineHost.cs b/T4Scaffolding.Core/Core/Templating/DynamicTextTemplatingEngineHost.cs index 7991879..aba1265 100644 --- a/T4Scaffolding.Core/Core/Templating/DynamicTextTemplatingEngineHost.cs +++ b/T4Scaffolding.Core/Core/Templating/DynamicTextTemplatingEngineHost.cs @@ -30,7 +30,7 @@ public class DynamicTextTemplatingEngineHost : MarshalByRefObject, ITextTemplati private AppDomain _templateAppDomain; public DynamicTextTemplatingEngineHost() { - FileEncoding = Encoding.UTF8; + FileEncoding = new UTF8Encoding(true); FileExtension = String.Empty; } diff --git a/T4Scaffolding.Core/T4Scaffolding.Core.csproj b/T4Scaffolding.Core/T4Scaffolding.Core.csproj index 0ae90f6..e8f670f 100644 --- a/T4Scaffolding.Core/T4Scaffolding.Core.csproj +++ b/T4Scaffolding.Core/T4Scaffolding.Core.csproj @@ -10,7 +10,7 @@ Properties T4Scaffolding T4Scaffolding - v4.5 + v4.8 512 SAK SAK @@ -117,6 +117,7 @@ + Always @@ -172,7 +173,7 @@ --> - + diff --git a/T4Scaffolding.Core/T4Scaffolding.Core.nuspec b/T4Scaffolding.Core/T4Scaffolding.Core.nuspec index 3303d71..9c929f4 100644 --- a/T4Scaffolding.Core/T4Scaffolding.Core.nuspec +++ b/T4Scaffolding.Core/T4Scaffolding.Core.nuspec @@ -1,18 +1,18 @@  - T4Scaffolding.Core.VS2017 - 1.0.1 - David Fowler, Scott Hanselman, Steve Sanderson, David Anderson, Cigano Morrison Mendez - T4Scaffolding.Core (Fix VS2017) + T4Scaffolding.Core.VS2019 + 1.0.2 + David Fowler, Scott Hanselman, Steve Sanderson, David Anderson, Cigano Morrison Mendez, Pablo Tôndolo de Vargas + T4Scaffolding.Core (Fix VS2019) A fast and customizable way to build parts of your .NET application via templates A fast and customizable way to build parts of your .NET application via templates - - + + diff --git a/T4Scaffolding.Core/app.config b/T4Scaffolding.Core/app.config new file mode 100644 index 0000000..26a6a19 --- /dev/null +++ b/T4Scaffolding.Core/app.config @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/T4Scaffolding.NuGetServices/Services/ScaffoldingSolutionManager.cs b/T4Scaffolding.NuGetServices/Services/ScaffoldingSolutionManager.cs index 989ee27..fb7ff1d 100644 --- a/T4Scaffolding.NuGetServices/Services/ScaffoldingSolutionManager.cs +++ b/T4Scaffolding.NuGetServices/Services/ScaffoldingSolutionManager.cs @@ -28,7 +28,7 @@ public ScaffoldingSolutionManager(string defaultProjectName) { if (exception.ErrorCode == -2147221005) { - _dte= (DTE)Marshal.GetActiveObject("visualstudio.dte.14.0"); + _dte= (DTE)Marshal.GetActiveObject("visualstudio.dte.15.0"); } else { diff --git a/T4Scaffolding.NuGetServices/T4Scaffolding.NuGetServices.csproj b/T4Scaffolding.NuGetServices/T4Scaffolding.NuGetServices.csproj index 4785ccf..62946ea 100644 --- a/T4Scaffolding.NuGetServices/T4Scaffolding.NuGetServices.csproj +++ b/T4Scaffolding.NuGetServices/T4Scaffolding.NuGetServices.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -10,13 +11,15 @@ Properties T4Scaffolding.NuGetServices T4Scaffolding.NuGetServices - v4.5 + v4.8 512 SAK SAK SAK SAK + + true @@ -39,84 +42,117 @@ - False ..\packages\VSSDK.DTE.7.0.4\lib\net20\envdte.dll - True + False + False + + + ..\packages\Microsoft.ServiceHub.Framework.2.0.69\lib\netstandard2.0\Microsoft.ServiceHub.Framework.dll - - ..\packages\VSSDK.ComponentModelHost.10.0.4\lib\net40\Microsoft.VisualStudio.ComponentModelHost.dll + + ..\packages\VSSDK.ComponentModelHost.12.0.4\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll False + + ..\packages\Microsoft.VisualStudio.CoreUtility.16.2.45\lib\net472\Microsoft.VisualStudio.CoreUtility.dll + ..\packages\VSSDK.GraphModel.12.0.4\lib\net45\Microsoft.VisualStudio.GraphModel.dll False - - ..\packages\Microsoft.VisualStudio.Imaging.15.0.26201\lib\net45\Microsoft.VisualStudio.Imaging.dll - True + + ..\packages\Microsoft.VisualStudio.ImageCatalog.16.3.29316.127\lib\net45\Microsoft.VisualStudio.ImageCatalog.dll + + + ..\packages\Microsoft.VisualStudio.Imaging.16.3.29318.209\lib\net45\Microsoft.VisualStudio.Imaging.dll + + + ..\packages\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.14.3.26930\lib\net20\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.dll + True - ..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll - True + ..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll - - ..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - True + + ..\packages\Microsoft.VisualStudio.Shell.15.0.16.3.29318.209\lib\net45\Microsoft.VisualStudio.Shell.15.0.dll - - ..\packages\VSSDK.Shell.Immutable.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - True + + ..\packages\Microsoft.VisualStudio.Shell.Framework.16.3.29318.209\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll - - ..\packages\VSSDK.Shell.Immutable.11.11.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll - True + + ..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.15.0.25415\lib\net45\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - - ..\packages\VSSDK.Shell.Immutable.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll - True + + ..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.15.0.25415\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll - - ..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll - True + + ..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.15.0.25415\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll + + + ..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.15.0.25405\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll - ..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll - True + ..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6072\lib\net11\Microsoft.VisualStudio.Shell.Interop.dll - False - ..\packages\VSSDK.Shell.Interop.10.10.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.10.0.dll - True + ..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30320\lib\net20\Microsoft.VisualStudio.Shell.Interop.10.0.dll + True + + + ..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61031\lib\net20\Microsoft.VisualStudio.Shell.Interop.11.0.dll + True + + + ..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30111\lib\net20\Microsoft.VisualStudio.Shell.Interop.12.0.dll + True + + + ..\packages\Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime.14.3.26929\lib\net20\Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime.dll + True + + + ..\packages\Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime.15.0.26929\lib\net20\Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime.dll + True + + + ..\packages\Microsoft.VisualStudio.Shell.Interop.15.6.DesignTime.15.6.27413\lib\net20\Microsoft.VisualStudio.Shell.Interop.15.6.DesignTime.dll + True - ..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True + ..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.Shell.Interop.8.0.dll - ..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll - True + ..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30730\lib\net11\Microsoft.VisualStudio.Shell.Interop.9.0.dll + + + ..\packages\Microsoft.VisualStudio.Text.Data.16.2.45\lib\net472\Microsoft.VisualStudio.Text.Data.dll - ..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll - True + ..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6071\lib\net11\Microsoft.VisualStudio.TextManager.Interop.dll - ..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True + ..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - - ..\packages\Microsoft.VisualStudio.TextTemplating.Interfaces.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.TextTemplating.Interfaces.14.0.dll - True + + ..\packages\Microsoft.VisualStudio.TextTemplating.Interfaces.15.0.16.3.29316.127\lib\net45\Microsoft.VisualStudio.TextTemplating.Interfaces.15.0.dll - - ..\packages\Microsoft.VisualStudio.Threading.15.3.23\lib\net45\Microsoft.VisualStudio.Threading.dll + + ..\packages\Microsoft.VisualStudio.Threading.16.4.16\lib\net472\Microsoft.VisualStudio.Threading.dll - - ..\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll - True + + ..\packages\Microsoft.VisualStudio.Utilities.16.3.29318.209\lib\net46\Microsoft.VisualStudio.Utilities.dll - ..\packages\Microsoft.VisualStudio.Validation.15.3.15\lib\net45\Microsoft.VisualStudio.Validation.dll + ..\packages\Microsoft.VisualStudio.Validation.15.5.31\lib\netstandard2.0\Microsoft.VisualStudio.Validation.dll + + + ..\packages\Microsoft.Win32.Registry.4.6.0\lib\net461\Microsoft.Win32.Registry.dll + + + ..\packages\Nerdbank.Streams.2.4.37\lib\netstandard2.0\Nerdbank.Streams.dll + + + ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll ..\ReferenceAssemblies\NuGet.Console.Types.dll @@ -125,20 +161,94 @@ - False ..\packages\VSSDK.DTE.7.0.4\lib\net20\stdole.dll - True + False + False + + + ..\packages\StreamJsonRpc.2.2.34\lib\netstandard2.0\StreamJsonRpc.dll + + ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + + + ..\packages\System.Collections.Immutable.1.6.0\lib\netstandard2.0\System.Collections.Immutable.dll + + + ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll + True + True + + + ..\packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll + False ..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\WindowsPowerShell\3.0\System.Management.Automation.dll + + ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll + + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True + True + + + ..\packages\System.Net.WebSockets.4.3.0\lib\net46\System.Net.WebSockets.dll + True + True + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll + True + True + + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Security.AccessControl.4.6.0\lib\net461\System.Security.AccessControl.dll + + + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll + True + True + + + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + + + ..\packages\System.Security.Principal.Windows.4.6.0\lib\net461\System.Security.Principal.Windows.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + @@ -176,9 +286,30 @@ + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + +