Skip to content

Fix the build in Visual Studio #1711

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

Merged
merged 11 commits into from
Sep 30, 2024
Merged

Fix the build in Visual Studio #1711

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4a460b4
Fix build in Visual Studio
dscho Sep 30, 2024
a59af02
Update the InnoSetup dependency to v6.3.1
dscho Sep 30, 2024
c6d28d3
installer: do require Windows 7 SP1 or later
dscho Sep 30, 2024
5441da0
installer: avoid using the deprecated `ParseVersion()` function
dscho Sep 30, 2024
cf935a7
installer: avoid running the `UninstallRun` entry more than once
dscho Sep 30, 2024
a749c92
Update the remaining dependencies
dscho Sep 30, 2024
6f13e76
Properly await `Assert.ThrowsAsync()` calls
dscho Sep 30, 2024
da12fc9
Use `Assert.Fail(message)` as appropriate
dscho Sep 30, 2024
48d06a7
Use preferred `Assert.*` patterns
dscho Sep 30, 2024
8bfe765
Use the `Trace2Exception`
dscho Sep 30, 2024
1a774c1
Replace broken `PlatformFact()` constructs
dscho Sep 30, 2024
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
Prev Previous commit
Next Next commit
Update the InnoSetup dependency to v6.3.1 
There is actually v6.3.3 already, but it does not seem to have
propagated to nuget.org yet.

While at it, use a centrally-defined property instead of repeating the
version number several times.

Signed-off-by: Johannes Schindelin <[email protected]>
  • Loading branch information
@dscho
dscho committed Sep 30, 2024
commit a59af02ae2d59383a32cf273f098bf8489ebbb57
7 changes: 4 additions & 3 deletions src/windows/Installer.Windows/Installer.Windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<EnableDefaultItems>false</EnableDefaultItems>
<PayloadPath>$(PlatformOutPath)Installer.Windows\bin\$(Configuration)\net472\win-x86</PayloadPath>
<InnoSetupVersion>6.3.1</InnoSetupVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -18,16 +19,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Tools.InnoSetup" Version="6.0.5" />
<PackageReference Include="Tools.InnoSetup" Version="$(InnoSetupVersion)" />
</ItemGroup>

<!-- Implicit SDK targets import (so we can override the default targets below) -->
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

<Target Name="CoreCompile" Condition="'$(OSPlatform)'=='windows'">
<PropertyGroup>
<InnoSetupCommandSystem>"$(NuGetPackageRoot)Tools.InnoSetup\6.0.5\tools\ISCC.exe" /DPayloadDir="$(PayloadPath)" /DInstallTarget=system "$(RepoSrcPath)\windows\Installer.Windows\Setup.iss" /O"$(OutputPath)"</InnoSetupCommandSystem>
<InnoSetupCommandUser>"$(NuGetPackageRoot)Tools.InnoSetup\6.0.5\tools\ISCC.exe" /DPayloadDir="$(PayloadPath)" /DInstallTarget=user "$(RepoSrcPath)\windows\Installer.Windows\Setup.iss" /O"$(OutputPath)"</InnoSetupCommandUser>
<InnoSetupCommandSystem>"$(NuGetPackageRoot)Tools.InnoSetup\$(InnoSetupVersion)\tools\ISCC.exe" /DPayloadDir="$(PayloadPath)" /DInstallTarget=system "$(RepoSrcPath)\windows\Installer.Windows\Setup.iss" /O"$(OutputPath)"</InnoSetupCommandSystem>
<InnoSetupCommandUser>"$(NuGetPackageRoot)Tools.InnoSetup\$(InnoSetupVersion)\tools\ISCC.exe" /DPayloadDir="$(PayloadPath)" /DInstallTarget=user "$(RepoSrcPath)\windows\Installer.Windows\Setup.iss" /O"$(OutputPath)"</InnoSetupCommandUser>
</PropertyGroup>

<Message Text="Lay Out" Importance="High" />
Expand Down