Skip to content

Commit 6db5653

Browse files
committed
WL#15682 [Remove 3rd party libraries from install bundles]
Change-Id: I680dee948f4d00a400f157c07e33c68f73e08fe7
1 parent 0359a64 commit 6db5653

File tree

3 files changed

+9
-334
lines changed

3 files changed

+9
-334
lines changed

CHANGES

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
- Reverted old code that allowed calling some procedures without using the StoredProcedure CommandType (Oracle Bug #29722378)
88
- Upgraded .NET Framework 4.5.2 to .NET Framework 4.6.2 with regard to packaging minimum version (WL15641).
99
- Changed broken references in summaries for some classes on the API documentation (Oracle Bug #35141281).
10-
- Deprecate the `Procedures with Parameters` schema collection (WL #15645)
10+
- Deprecate the `Procedures with Parameters` schema collection (WL #15645).
11+
- Remove 3rd party libraries from install bundles (WL #15682).
12+
1113

1214
8.0.32.1
1315
- Fixed a bug related to how the authentication libraries are added to the NuGet Package (MySQL Bug #109670, Oracle Bug #34990010).

MySQL.Data/src/Framework/net462/Installer.cs

Lines changed: 0 additions & 322 deletions
This file was deleted.

MySQL.Data/src/MySql.Data.csproj

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project>
22
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
33

44
<PropertyGroup>
@@ -34,7 +34,7 @@
3434
</PropertyGroup>
3535

3636
<ItemGroup>
37-
<None Include="..\..\Nuget\Data\images\logo-mysql-170x115.png" Pack="true" PackagePath="\"/>
37+
<None Include="..\..\Nuget\Data\images\logo-mysql-170x115.png" Pack="true" PackagePath="\" />
3838
</ItemGroup>
3939

4040
<ItemGroup>
@@ -43,7 +43,7 @@
4343

4444
<ItemGroup>
4545
<PackageReference Include="Google.Protobuf" Version="3.21.9" />
46-
<PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.5" />
46+
<PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.5" />
4747
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
4848
<PackageReference Include="System.Buffers" Version="4.5.1" />
4949
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
@@ -64,15 +64,12 @@
6464
<Reference Include="System.Data" />
6565
<Reference Include="System.Transactions" />
6666
<Reference Include="System.Configuration" />
67-
<Reference Include="System.Configuration.Install" />
6867
<Reference Include="System.Management" />
6968
<Reference Include="ZstdNet">
7069
<HintPath>..\..\Dependencies\ZstdNet\NetFramework\ZstdNet.dll</HintPath>
7170
</Reference>
7271
<EmbeddedResource Include="Resources.resx;ResourcesX.resx;Properties\ReservedWords.txt" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
73-
<EmbeddedResource Include="..\..\Dependencies\ZstdNet\NetFramework\libzstd.dll">
74-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
75-
</EmbeddedResource>
72+
<EmbeddedResource Include="..\..\Dependencies\ZstdNet\NetFramework\libzstd.dll" />
7673
</ItemGroup>
7774

7875
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='netstandard2.1' or '$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0'">
@@ -85,13 +82,11 @@
8582
<Reference Include="ZstdNet">
8683
<HintPath>..\..\Dependencies\ZstdNet\NetStandard2.0\ZstdNet.dll</HintPath>
8784
</Reference>
88-
<EmbeddedResource Include="..\..\Dependencies\ZstdNet\NetStandard2.0\libzstd.dll">
89-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
90-
</EmbeddedResource>
85+
<EmbeddedResource Include="..\..\Dependencies\ZstdNet\NetStandard2.0\libzstd.dll" />
9186
</ItemGroup>
9287

9388
<ItemGroup>
94-
<Content Include="..\..\Dependencies\MITLibs\comerr64.dll" PackagePath="runtimes\win-x64\native" CopyToOutputDirectory="Always"/>
89+
<Content Include="..\..\Dependencies\MITLibs\comerr64.dll" PackagePath="runtimes\win-x64\native" CopyToOutputDirectory="Always" />
9590
<Content Include="..\..\Dependencies\MITLibs\gssapi64.dll" PackagePath="runtimes\win-x64\native" CopyToOutputDirectory="Always" />
9691
<Content Include="..\..\Dependencies\MITLibs\k5sprt64.dll" PackagePath="runtimes\win-x64\native" CopyToOutputDirectory="Always" />
9792
<Content Include="..\..\Dependencies\MITLibs\krb5_64.dll" PackagePath="runtimes\win-x64\native" CopyToOutputDirectory="Always" />

0 commit comments

Comments
 (0)