Skip to content

Commit 3eea7dd

Browse files
committed
update .net version to 4.7.2
1 parent 9f82175 commit 3eea7dd

File tree

5 files changed

+79
-70
lines changed

5 files changed

+79
-70
lines changed

NSF2SQL/App.config

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
55
</startup>
6-
<system.data>
7-
<DbProviderFactories>
8-
<remove invariant="MySql.Data.MySqlClient" />
9-
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.8.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
10-
</DbProviderFactories>
11-
</system.data></configuration>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-3.8.0.0" newVersion="3.8.0.0" />
11+
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0" />
15+
</dependentAssembly>
16+
</assemblyBinding>
17+
</runtime>
18+
</configuration>

NSF2SQL/NSF2SQL.csproj

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>NSF2SQL</RootNamespace>
1111
<AssemblyName>NSF2SQL</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<PublishUrl>publish\</PublishUrl>
1515
<Install>true</Install>
@@ -26,6 +26,7 @@
2626
<IsWebBootstrapper>false</IsWebBootstrapper>
2727
<UseApplicationTrust>false</UseApplicationTrust>
2828
<BootstrapperEnabled>true</BootstrapperEnabled>
29+
<TargetFrameworkProfile />
2930
</PropertyGroup>
3031
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3132
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -51,20 +52,37 @@
5152
<ApplicationIcon>nsf2sql.ico</ApplicationIcon>
5253
</PropertyGroup>
5354
<ItemGroup>
54-
<Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55-
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>bin\Debug\Microsoft.WindowsAPICodePack.dll</HintPath>
55+
<Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
56+
<HintPath>..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
5757
</Reference>
58-
<Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<SpecificVersion>False</SpecificVersion>
60-
<HintPath>bin\Debug\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
58+
<Reference Include="Google.Protobuf, Version=3.8.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Google.Protobuf.3.8.0\lib\net45\Google.Protobuf.dll</HintPath>
6160
</Reference>
62-
<Reference Include="MySql.Data, Version=6.8.8.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
63-
<HintPath>..\packages\MySql.Data.6.8.8\lib\net45\MySql.Data.dll</HintPath>
64-
<Private>True</Private>
61+
<Reference Include="Interop.Domino, Version=1.2.0.0, Culture=neutral, processorArchitecture=x86">
62+
<HintPath>..\packages\interop.domino.dll.1.0.0\lib\Interop.Domino.dll</HintPath>
63+
<EmbedInteropTypes>True</EmbedInteropTypes>
64+
</Reference>
65+
<Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
66+
<HintPath>..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
67+
</Reference>
68+
<Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
69+
<HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
70+
</Reference>
71+
<Reference Include="MySql.Data, Version=8.0.17.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
72+
<HintPath>..\packages\MySql.Data.8.0.17\lib\net452\MySql.Data.dll</HintPath>
73+
</Reference>
74+
<Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
75+
<HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
6576
</Reference>
6677
<Reference Include="System" />
78+
<Reference Include="System.ComponentModel" />
79+
<Reference Include="System.ComponentModel.DataAnnotations" />
80+
<Reference Include="System.Configuration" />
81+
<Reference Include="System.Configuration.Install" />
6782
<Reference Include="System.Core" />
83+
<Reference Include="System.Drawing.Design" />
84+
<Reference Include="System.Management" />
85+
<Reference Include="System.Transactions" />
6886
<Reference Include="System.Xml.Linq" />
6987
<Reference Include="System.Data.DataSetExtensions" />
7088
<Reference Include="Microsoft.CSharp" />
@@ -109,6 +127,7 @@
109127
<Compile Include="Properties\Resources.Designer.cs">
110128
<AutoGen>True</AutoGen>
111129
<DependentUpon>Resources.resx</DependentUpon>
130+
<DesignTime>True</DesignTime>
112131
</Compile>
113132
<None Include="packages.config" />
114133
<None Include="Properties\Settings.settings">
@@ -124,17 +143,6 @@
124143
<ItemGroup>
125144
<None Include="App.config" />
126145
</ItemGroup>
127-
<ItemGroup>
128-
<COMReference Include="Domino">
129-
<Guid>{29131520-2EED-1069-BF5D-00DD011186B7}</Guid>
130-
<VersionMajor>1</VersionMajor>
131-
<VersionMinor>2</VersionMinor>
132-
<Lcid>0</Lcid>
133-
<WrapperTool>tlbimp</WrapperTool>
134-
<Isolated>False</Isolated>
135-
<EmbedInteropTypes>True</EmbedInteropTypes>
136-
</COMReference>
137-
</ItemGroup>
138146
<ItemGroup>
139147
<Content Include="nsf2sql.ico" />
140148
</ItemGroup>

NSF2SQL/Properties/Resources.Designer.cs

Lines changed: 19 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

NSF2SQL/Properties/Settings.Designer.cs

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

NSF2SQL/packages.config

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MySql.Data" version="6.8.8" targetFramework="net45" />
3+
<package id="BouncyCastle" version="1.8.5" targetFramework="net472" />
4+
<package id="Google.Protobuf" version="3.8.0" targetFramework="net472" />
5+
<package id="interop.domino.dll" version="1.0.0" targetFramework="net472" />
6+
<package id="MySql.Data" version="8.0.17" targetFramework="net472" />
7+
<package id="SSH.NET" version="2016.1.0" targetFramework="net472" />
8+
<package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net472" />
9+
<package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net472" />
410
</packages>

0 commit comments

Comments
 (0)