Skip to content

Porting to VS2019 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pablotdv wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Porting to VS2019 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5c5722
Update to VS2019
pablotdv Oct 19, 2019
ba39979
Example project and Write files with Enconding UTF8-BOM
pablotdv Oct 19, 2019
0cc588c
Remove example project
pablotdv Oct 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MvcScaffolding/MvcScaffolding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MvcScaffolding</RootNamespace>
<AssemblyName>MvcScaffolding</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down Expand Up @@ -241,7 +241,7 @@
<!-- First append the standard code blocks to each of the view templates that need them -->
<Exec Command="$(MSBuildProjectDirectory)\AppendStandardCodeToViews.bat $(OutputPath)" />
<!-- Next invoke NuGet to create a .nupkg and copy it to BuiltPackages -->
<Exec Command="$(MSBuildProjectDirectory)\..\Tools\NuPack.exe pack" WorkingDirectory="$(OutputPath)" />
<Exec Command="$(MSBuildProjectDirectory)\..\Tools\nuget.exe pack" WorkingDirectory="$(OutputPath)" />
<CreateItem Include=".\**\*.nupkg">
<Output TaskParameter="Include" ItemName="BuiltPackages" />
</CreateItem>
Expand Down
10 changes: 5 additions & 5 deletions MvcScaffolding/MvcScaffolding.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<package>
<metadata>
<id>MvcScaffolding.VS2017</id>
<version>1.0.2</version>
<authors>Scott Hanselman, Steve Sanderson, David Anderson, Cigano Morrison Mendez</authors>
<title>MvcScaffolding (Fix VS2017)</title>
<id>MvcScaffolding.VS2019</id>
<version>1.0.3</version>
<authors>Scott Hanselman, Steve Sanderson, David Anderson, Cigano Morrison Mendez, Pablo Tôndolo de Vargas</authors>
<title>MvcScaffolding (Fix VS2019)</title>
<description>A fast and customizable way to add controllers, views, and other items to your ASP.NET MVC application</description>
<summary>A fast and customizable way to add controllers, views, and other items to your ASP.NET MVC application</summary>
<dependencies>
<dependency id="T4Scaffolding.VS2017" version="1.0.1" />
<dependency id="T4Scaffolding.VS2019" version="1.0.2" />
</dependencies>
</metadata>
<files>
Expand Down
34 changes: 4 additions & 30 deletions Scaffolding.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion T4Scaffolding.Core/Core/Configuration/XmlScaffoldingConfigStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion T4Scaffolding.Core/Core/FileSystem/DefaultFileSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.IO;
using System.Text;

namespace T4Scaffolding.Core.FileSystem
{
Expand Down Expand Up @@ -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<string> FindFiles(string path, string pattern, bool includeSubdirectories)
Expand Down
2 changes: 1 addition & 1 deletion T4Scaffolding.Core/Core/Templating/DynamicTextTemplatingEngineHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class DynamicTextTemplatingEngineHost : MarshalByRefObject, ITextTemplati
private AppDomain _templateAppDomain;

public DynamicTextTemplatingEngineHost() {
FileEncoding = Encoding.UTF8;
FileEncoding = new UTF8Encoding(true);
FileExtension = String.Empty;
}

Expand Down
5 changes: 3 additions & 2 deletions T4Scaffolding.Core/T4Scaffolding.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>T4Scaffolding</RootNamespace>
<AssemblyName>T4Scaffolding</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down Expand Up @@ -117,6 +117,7 @@
<Compile Include="ViewScaffolderAttribute.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="init.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -172,7 +173,7 @@
</Target>
-->
<Target Name="AfterBuild">
<Exec Command="$(MSBuildProjectDirectory)\..\Tools\NuPack.exe pack" WorkingDirectory="$(OutputPath)\..\..\" />
<Exec Command="$(MSBuildProjectDirectory)\..\Tools\nuget.exe pack" WorkingDirectory="$(OutputPath)\..\..\" />
<CreateItem Include=".\**\*.nupkg">
<Output TaskParameter="Include" ItemName="BuiltPackages" />
</CreateItem>
Expand Down
12 changes: 6 additions & 6 deletions T4Scaffolding.Core/T4Scaffolding.Core.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8" ?>
<package>
<metadata>
<id>T4Scaffolding.Core.VS2017</id>
<version>1.0.1</version>
<authors>David Fowler, Scott Hanselman, Steve Sanderson, David Anderson, Cigano Morrison Mendez</authors>
<title>T4Scaffolding.Core (Fix VS2017)</title>
<id>T4Scaffolding.Core.VS2019</id>
<version>1.0.2</version>
<authors>David Fowler, Scott Hanselman, Steve Sanderson, David Anderson, Cigano Morrison Mendez, Pablo Tôndolo de Vargas</authors>
<title>T4Scaffolding.Core (Fix VS2019)</title>
<description>A fast and customizable way to build parts of your .NET application via templates</description>
<summary>A fast and customizable way to build parts of your .NET application via templates</summary>
</metadata>
<files>
<file src="Scaffolders\**\*.t4" target="tools" />
<file src="Scaffolders\**\*.ps1" target="tools" />
<file src="bin\Release\T4Scaffolding.dll" target="tools" />
<file src="bin\Release\T4Scaffolding.NuGetServices.dll" target="tools" />
<file src="bin\Debug\T4Scaffolding.dll" target="tools" />
<file src="bin\Debug\T4Scaffolding.NuGetServices.dll" target="tools" />
<file src="*.ps1*" target="tools" />
<file src="scaffoldingTabExpansion.psm1" target="tools" />
<file src="InstallationDummyFile.txt" target="content" />
Expand Down
67 changes: 67 additions & 0 deletions T4Scaffolding.Core/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Utilities" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-16.4.0.0" newVersion="16.4.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Imaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.CoreUtility" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Nerdbank.Streams" publicKeyToken="cac503e1823ce71c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="StreamJsonRpc" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.Shell.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-16.0.0.0" newVersion="16.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>
2 changes: 1 addition & 1 deletion T4Scaffolding.NuGetServices/Services/ScaffoldingSolutionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Loading