Skip to content

Commit 7378063

Browse files
committed
Merge in 'release/6.0' changes
2 parents af88d14 + 86f7f37 commit 7378063

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@
267267
<XunitExtensibilityCoreVersion>$(XunitVersion)</XunitExtensibilityCoreVersion>
268268
<XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
269269
<XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
270-
<MicrosoftDataSqlClientVersion>1.0.19249.1</MicrosoftDataSqlClientVersion>
270+
<MicrosoftDataSqlClientVersion>2.1.7</MicrosoftDataSqlClientVersion>
271271
<MicrosoftAspNetCoreAppVersion>6.0.0-preview.3.21167.1</MicrosoftAspNetCoreAppVersion>
272272
</PropertyGroup>
273273
<!-- Restore feeds -->

eng/targets/Wix.Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<SchemaVersion>2.0</SchemaVersion>
66
<ProductVersion>3.14</ProductVersion>
7-
<WixVersion>1.0.0-v3.14.0.5722</WixVersion>
7+
<WixVersion>3.14.0-8606.20240208.1</WixVersion>
88
</PropertyGroup>
99

1010
<PropertyGroup>

eng/tools/RepoTasks/RepoTasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</ItemGroup>
2727

2828
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
29-
<PackageReference Include="Microsoft.Signed.Wix" Version="1.0.0-v3.14.0.5722" />
29+
<PackageReference Include="Microsoft.Signed.Wix" Version="3.14.0-8606.20240208.1" />
3030
<PackageReference Include="System.Net.Http" Version="4.3.4" />
3131

3232
<Reference Include="Microsoft.Build" />

0 commit comments

Comments
 (0)