Skip to content

Commit

Permalink
Merge in 'release/7.0' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Apr 12, 2024
2 parents 9142e56 + 27a0ea7 commit 1591ba7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion eng/targets/Wix.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
<ProductVersion>3.14</ProductVersion>
<WixVersion>3.14.0-8606.20240208.1</WixVersion>
<WixVersion>$(MicrosoftSignedWixVersion)</WixVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/tools/RepoTasks/RepoTasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageReference Include="Microsoft.Signed.Wix" Version="3.14.0-8606.20240208.1" />
<PackageReference Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />

<Reference Include="Microsoft.Build" />
Expand Down

0 comments on commit 1591ba7

Please sign in to comment.