Reverting build with DTE instead of devenv solution. Closes #48.

Roald87 · Apr 2, 2021 · 2876e1b · 2876e1b
1 parent 81fe29e
commit 2876e1b
Show file tree

Hide file tree

Showing 11 changed files with 185 additions and 464 deletions.
diff --git a/src/TcBlack/BuildTwinCatProject.bat b/src/TcBlack/BuildTwinCatProject.bat
@@ -0,0 +1 @@
+start /wait "" %1 %2 /Project %3 /Build "Debug|TwinCAT RT (x64)" /Out build.log 
diff --git a/src/TcBlack/MessageFilter.cs b/src/TcBlack/MessageFilter.cs
diff --git a/src/TcBlack/NLog.config b/src/TcBlack/NLog.config
diff --git a/src/TcBlack/Program.cs b/src/TcBlack/Program.cs
@@ -52,9 +52,14 @@ class Options
                 HelpText = "Overrides the line ending of all files with UNIX' \\n."
             )]
             public bool UnixLineEnding { get; set; }
+
+            [Option(
+                Default = false,
+                HelpText = "Outputs build info. Has no effect in non-safe mode."
+            )]
+            public bool Verbose { get; set; }
         }
 
-        [STAThread]
         static void Main(string[] args)
         {
             Parser.Default.ParseArguments<Options>(args).WithParsed(options =>
@@ -150,7 +155,7 @@ static void SafeFormat(string[] filenames, Options options)
             string hashBeforeFormat = string.Empty;
             try
             {
-                hashBeforeFormat = tcProject.Build().Hash;
+                hashBeforeFormat = tcProject.Build(options.Verbose).Hash;
             }
             catch(ProjectBuildFailed)
             {
@@ -179,7 +184,7 @@ static void SafeFormat(string[] filenames, Options options)
             string hashAfterFormat = string.Empty;
             try
             {
-                hashAfterFormat = tcProject.Build().Hash;
+                hashAfterFormat = tcProject.Build(options.Verbose).Hash;
             }
             catch(ProjectBuildFailed)
             {

diff --git a/src/TcBlack/TcBlack.csproj b/src/TcBlack/TcBlack.csproj
@@ -35,16 +35,8 @@
     <Reference Include="CommandLine, Version=2.8.0.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
       <HintPath>..\packages\CommandLineParser.2.8.0\lib\net461\CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.5\lib\net45\NLog.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -58,7 +50,6 @@
     <Compile Include="EmptyLine.cs" />
     <Compile Include="Global.cs" />
     <Compile Include="Keywords.cs" />
-    <Compile Include="MessageFilter.cs" />
     <Compile Include="ObjectDefinition.cs" />
     <Compile Include="ICodeLineOperations.cs" />
     <Compile Include="Program.cs" />
@@ -70,37 +61,17 @@
     <Compile Include="VariableBlockEnd.cs" />
     <Compile Include="VariableBlockStart.cs" />
     <Compile Include="VariableDeclaration.cs" />
-    <Compile Include="VisualStudioInstance.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="NLog.config">
-      <SubType>Designer</SubType>
+    <None Include="BuildTwinCatProject.bat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="EnvDTE">
-      <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE80">
-      <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>tlbimp</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
     <COMReference Include="stdole">
       <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>2</VersionMajor>
@@ -110,15 +81,6 @@
       <Isolated>False</Isolated>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
-    <COMReference Include="TCatSysManagerLib">
-      <Guid>{3C49D6C3-93DC-11D0-B162-00A0248C244B}</Guid>
-      <VersionMajor>3</VersionMajor>
-      <VersionMinor>3</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>