Merge branch 'release/v1.7.35'

proge-software · Jun 12, 2020 · d66a0f9 · d66a0f9
2 parents 0413327 + 86e3c25
commit d66a0f9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 28 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -66,7 +66,7 @@ jobs:
         uses: warrenbuckley/Setup-MSBuild@v1
 
       - name: Build with MSBuild
-        run: msbuild $env:Solution_Path /property:Configuration=$env:BuildConfiguration /property:Version=${{steps.gitversion.outputs.assemblySemVer}} /property:AssemblyVersion=${{steps.gitversion.outputs.assemblySemFileVer}}
+        run: msbuild $env:Solution_Path /property:Configuration=$env:BuildConfiguration
 
       - name: upload vsix as artifact
         uses: actions/upload-artifact@v2

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -67,7 +67,7 @@ jobs:
         uses: warrenbuckley/Setup-MSBuild@v1
 
       - name: Build with MSBuild
-        run: msbuild $env:Solution_Path /property:Configuration=$env:BuildConfiguration /property:Version=${{steps.gitversion.outputs.assemblySemVer}} /property:AssemblyVersion=${{steps.gitversion.outputs.assemblySemFileVer}}
+        run: msbuild $env:Solution_Path /property:Configuration=$env:BuildConfiguration
 
       - name: upload vsix as artifact
         uses: actions/upload-artifact@v2

diff --git a/GitFlowWithPR.VS.Extension/GitFlowVersion.cs b/GitFlowWithPR.VS.Extension/GitFlowVersion.cs
@@ -6,24 +6,15 @@ namespace GitFlowWithPRVS.Extension
     public static class GitFlowVersion
     {
 
-        private static string GetVersion()
-        {
-            Assembly assembly = Assembly.GetExecutingAssembly();
-            System.Diagnostics.FileVersionInfo fvi = System.Diagnostics.FileVersionInfo.GetVersionInfo(assembly.Location);
-            string version = fvi.FileVersion;
-            Logger.Event("Version -"+version);
-            return version;
-        }
-
         private static string GetFileInstallation()
         {
-            return Path.Combine(Assembly.GetExecutingAssembly().Location, GetVersion());
+            return Path.Combine(Assembly.GetExecutingAssembly().Location, "IsFirstInstallation");
         }
 
         public static bool IsFirstInstallation()
         {
             var path = GetFileInstallation();
-            Logger.Event("IsFirstInstallation -" + GetVersion());
+            Logger.Event("IsFirstInstallation -" + path);
 
             if (!File.Exists(path))
                 return true;

diff --git a/GitFlowWithPR.VS.Extension/GitFlowWithPR.VS.Extension.csproj b/GitFlowWithPR.VS.Extension/GitFlowWithPR.VS.Extension.csproj
@@ -796,18 +796,6 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Target Name="BeforeBuild">
-    <Message Text="Updating AssemblyInfo to Version $(VersionNumber)">
-    </Message>
-    <Message Text="Writing to AssemblyInfo files in $(SolutionRoot)">
-    </Message>
-      <AssemblyInfo
-                  CodeLanguage="CS"          
-                  AssemblyVersion="$(VersionNumber)"
-                  AssemblyFileVersion="$(VersionNumber)"
-                  >
-      </AssemblyInfo>
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="AfterBuild">
@@ -835,12 +823,10 @@
     <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.0.0\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.3.0.0\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.16.7.13\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.16.7.13\build\Microsoft.VSSDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.16.7.13\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.16.7.13\build\Microsoft.VSSDK.BuildTools.targets'))" />
-    <Error Condition="!Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" />
   </Target>
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <Import Project="..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.30\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.30\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
   <Import Project="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.6.13\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.6.13\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
   <Import Project="..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.5.5\build\Microsoft.VisualStudio.SDK.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.5.5\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" />
   <Import Project="..\packages\Microsoft.VSSDK.BuildTools.16.7.13\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.16.7.13\build\Microsoft.VSSDK.BuildTools.targets')" />
-  <Import Project="..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets" Condition="Exists('..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" />
 </Project>
diff --git a/GitFlowWithPR.VS.Extension/packages.config b/GitFlowWithPR.VS.Extension/packages.config
@@ -44,7 +44,6 @@
   <package id="Microsoft.VisualStudio.Validation" version="15.5.31" targetFramework="net472" />
   <package id="Microsoft.VSSDK.BuildTools" version="16.7.13" targetFramework="net472" developmentDependency="true" />
   <package id="Microsoft.Win32.Registry" version="4.7.0" targetFramework="net472" />
-  <package id="MSBuildTasks" version="1.5.0.235" targetFramework="net48" developmentDependency="true" />
   <package id="Nerdbank.Streams" version="2.5.60" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
   <package id="StreamJsonRpc" version="2.4.48" targetFramework="net472" />