Skip to content

Commit 65947a7

Browse files
committed
Message for exception
1 parent 130c53c commit 65947a7

File tree

4 files changed

+26
-9
lines changed

4 files changed

+26
-9
lines changed

Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/DriverFactory.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ private static SqlDriver CreateDriverInstance(string connectionString, Version v
123123
5 when version.Minor == 5 => new v5_5.Driver(coreServerInfo),
124124
5 when version.Minor == 6 => new v5_6.Driver(coreServerInfo),
125125
5 when version.Minor == 7 => new v5_7.Driver(coreServerInfo),
126-
6 => throw new NotSupportedException(),
127-
7 => throw new NotSupportedException(),
126+
6 or 7 => throw new NotSupportedException(string.Format(Strings.ExVersionXOfMySQLIsNotSupported, version)),
128127
8 => new v8_0.Driver(coreServerInfo),
129128
_ => new v8_0.Driver(coreServerInfo)
130129
};

Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/Resources/Strings.Designer.cs

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/Resources/Strings.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,7 @@
135135
<data name="ExUserNameRequired" xml:space="preserve">
136136
<value>MySQL Username is required.</value>
137137
</data>
138+
<data name="ExVersionXOfMySQLIsNotSupported" xml:space="preserve">
139+
<value>Version {0} of MySQL is not supported.</value>
140+
</data>
138141
</root>

Orm/Xtensive.Orm.MySql/Xtensive.Orm.MySql.csproj

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
44
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
@@ -23,15 +23,21 @@
2323
</Compile>
2424
</ItemGroup>
2525
<ItemGroup>
26-
<Compile Update="Sql.Drivers.MySql\Resources\Strings.Designer.cs">
27-
<DesignTime>True</DesignTime>
28-
<AutoGen>True</AutoGen>
29-
<DependentUpon>Strings.resx</DependentUpon>
30-
</Compile>
26+
<EmbeddedResource Update="Sql.Drivers.MySql\Resources\Strings.resx">
27+
<Generator>ResXFileCodeGenerator</Generator>
28+
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
29+
</EmbeddedResource>
3130
</ItemGroup>
3231
<ItemGroup>
3332
<PackageReference Include="Google.Protobuf" Version="3.15.0" />
3433
<PackageReference Include="MySql.Data" Version="8.0.19" />
3534
<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
3635
</ItemGroup>
36+
<ItemGroup>
37+
<Compile Update="Sql.Drivers.MySql\Resources\Strings.Designer.cs">
38+
<DesignTime>True</DesignTime>
39+
<AutoGen>True</AutoGen>
40+
<DependentUpon>Strings.resx</DependentUpon>
41+
</Compile>
42+
</ItemGroup>
3743
</Project>

0 commit comments

Comments
 (0)