v1.2.9 Less crashes

jokedst · Feb 17, 2022 · 8b5e3f3 · 8b5e3f3
1 parent 86aae97
commit 8b5e3f3
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/ATray/ATray.csproj b/ATray/ATray.csproj
@@ -273,24 +273,25 @@
       <Version>11.0.2</Version>
     </PackageReference>
     <PackageReference Include="NuGet.CommandLine">
-      <Version>4.7.1</Version>
+      <Version>6.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="squirrel.windows">
-      <Version>1.9.0</Version>
+    <PackageReference Include="squirrel.windows" GeneratePathProperty="true" >
+      <Version>2.0.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- Squirrel - create release package on Release builds  -->
   <Target Name="AfterBuild" Condition=" '$(Configuration)' == 'Release'">
+	<Message Text="Message from MSBuild: $(Pkgsquirrel_windows)" />
     <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-      <Output TaskParameter="Assemblies" ItemName="ATrayAssemblyInfo" />
+	  <Output TaskParameter="Assemblies" ItemName="ATrayAssemblyInfo"/>
     </GetAssemblyIdentity>
     <PropertyGroup>
       <SymVer3>$([System.Version]::Parse(%(ATrayAssemblyInfo.Version)).ToString(3))</SymVer3>
-    </PropertyGroup>
-    <Exec Command="NuGet.exe pack ATray.nuspec -Version %(ATrayAssemblyInfo.Version) -Properties Configuration=Release -OutputDirectory $(OutDir) -BasePath $(OutDir)" />
-    <Exec Command='"$(NuGetPackageFolders)squirrel.windows\1.9.0\tools\squirrel" --releasify $(OutDir)ATray.$(SymVer3).nupkg -baseUrl https://github.com/jokedst/ATray/releases/download/v$(SymVer3)/' />
-  </Target>
+    </PropertyGroup>  
+    <Exec Command='"$(PkgNuGet_CommandLine)\tools\NuGet.exe" pack ATray.nuspec -Version %(ATrayAssemblyInfo.Version) -Properties Configuration=Release -OutputDirectory $(OutDir) -BasePath $(OutDir)' />
+    <Exec Command='"$(Pkgsquirrel_windows)\tools\squirrel" --releasify $(OutDir)ATray.$(SymVer3).nupkg -baseUrl https://github.com/jokedst/ATray/releases/download/v$(SymVer3)/' />
+</Target>
 </Project>
diff --git a/ATray/Properties/AssemblyInfo.cs b/ATray/Properties/AssemblyInfo.cs
@@ -9,5 +9,5 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("b4b6516d-9518-4b56-8006-699d681127ec")]
 
-[assembly: AssemblyVersion("1.2.8.0")]
-[assembly: AssemblyFileVersion("1.2.8.0")]
+[assembly: AssemblyVersion("1.2.9.0")]
+[assembly: AssemblyFileVersion("1.2.9.0")]
diff --git a/ATray/Releases/ATray-1.2.9-delta.nupkg b/ATray/Releases/ATray-1.2.9-delta.nupkg
diff --git a/ATray/Releases/ATray-1.2.9-full.nupkg b/ATray/Releases/ATray-1.2.9-full.nupkg
diff --git a/ATray/Releases/RELEASES b/ATray/Releases/RELEASES
@@ -32,4 +32,6 @@ BFB6EEE20F9E56EF595280B2AAE37735E1C5F01F https://github.com/jokedst/ATray/releas
 01AE8EA35E7824B2A84579E954D520C5DFEBAFC9 https://github.com/jokedst/ATray/releases/download/v1.2.7/ATray-1.2.7-delta.nupkg 385793
 DD8A60EE5FB26C8AE76BE48C059F0966BBF6E9E6 https://github.com/jokedst/ATray/releases/download/v1.2.7/ATray-1.2.7-full.nupkg 6995618
 7A4C7AB10B50098CC0B01A6481FDB18D63704011 https://github.com/jokedst/ATray/releases/download/v1.2.8/ATray-1.2.8-delta.nupkg 55875
-1DC059B3B958A9A68356DB3545B1848D9A49E23A https://github.com/jokedst/ATray/releases/download/v1.2.8/ATray-1.2.8-full.nupkg 6683563
+1DC059B3B958A9A68356DB3545B1848D9A49E23A https://github.com/jokedst/ATray/releases/download/v1.2.8/ATray-1.2.8-full.nupkg 6683563
+2320A187C04C1F4DC6075ED77A57D92CDB41184C https://github.com/jokedst/ATray/releases/download/v1.2.9/ATray-1.2.9-delta.nupkg 5296233
+EE3D64E5912F1627CCCD151ED8220FF79CA1D7A9 https://github.com/jokedst/ATray/releases/download/v1.2.9/ATray-1.2.9-full.nupkg 9831925
diff --git a/ATray/Releases/Setup.exe b/ATray/Releases/Setup.exe
diff --git a/ATray/Releases/Setup.msi b/ATray/Releases/Setup.msi
diff --git a/Atray.Tests/Atray.Tests.csproj b/Atray.Tests/Atray.Tests.csproj
@@ -98,7 +98,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NuGet.CommandLine">
-      <Version>4.7.1</Version>
+      <Version>6.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>