Skip to content

Commit 26375ec

Browse files
authored
Merge pull request #304 from ckadluba/issue-283
Fix missing Microsoft.Data.SqlClient.Sni.dll
2 parents 7be611a + f43478a commit 26375ec

File tree

2 files changed

+55
-0
lines changed

2 files changed

+55
-0
lines changed

sample/AppConfigDemo/AppConfigDemo.csproj

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<Deterministic>true</Deterministic>
15+
<NuGetPackageImportStamp>
16+
</NuGetPackageImportStamp>
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1719
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,12 +35,36 @@
3335
<WarningLevel>4</WarningLevel>
3436
</PropertyGroup>
3537
<ItemGroup>
38+
<Reference Include="Microsoft.Data.SqlClient, Version=1.13.20136.2, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
39+
<HintPath>..\..\packages\Microsoft.Data.SqlClient.1.1.3\lib\net46\Microsoft.Data.SqlClient.dll</HintPath>
40+
</Reference>
3641
<Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
3742
<HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
3843
</Reference>
3944
<Reference Include="Microsoft.Extensions.Primitives, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
4045
<HintPath>..\..\packages\Microsoft.Extensions.Primitives.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
4146
</Reference>
47+
<Reference Include="Microsoft.Identity.Client, Version=3.0.8.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
48+
<HintPath>..\..\packages\Microsoft.Identity.Client.3.0.8\lib\net45\Microsoft.Identity.Client.dll</HintPath>
49+
</Reference>
50+
<Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<HintPath>..\..\packages\Microsoft.IdentityModel.JsonWebTokens.5.5.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
52+
</Reference>
53+
<Reference Include="Microsoft.IdentityModel.Logging, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54+
<HintPath>..\..\packages\Microsoft.IdentityModel.Logging.5.5.0\lib\net461\Microsoft.IdentityModel.Logging.dll</HintPath>
55+
</Reference>
56+
<Reference Include="Microsoft.IdentityModel.Protocols, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57+
<HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.dll</HintPath>
58+
</Reference>
59+
<Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.5.5.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
61+
</Reference>
62+
<Reference Include="Microsoft.IdentityModel.Tokens, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.5.5.0\lib\net461\Microsoft.IdentityModel.Tokens.dll</HintPath>
64+
</Reference>
65+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
66+
<HintPath>..\..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
67+
</Reference>
4268
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
4369
<HintPath>..\..\packages\Serilog.2.9.0\lib\net46\Serilog.dll</HintPath>
4470
</Reference>
@@ -48,6 +74,16 @@
4874
</Reference>
4975
<Reference Include="System.Configuration" />
5076
<Reference Include="System.Core" />
77+
<Reference Include="System.Data.Common, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78+
<HintPath>..\..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
79+
<Private>True</Private>
80+
<Private>True</Private>
81+
</Reference>
82+
<Reference Include="System.Drawing" />
83+
<Reference Include="System.IdentityModel" />
84+
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
85+
<HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.5.5.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll</HintPath>
86+
</Reference>
5187
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
5288
<HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
5389
</Reference>
@@ -58,6 +94,7 @@
5894
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
5995
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
6096
</Reference>
97+
<Reference Include="System.Windows.Forms" />
6198
<Reference Include="System.Xml.Linq" />
6299
<Reference Include="System.Data.DataSetExtensions" />
63100
<Reference Include="Microsoft.CSharp" />
@@ -82,4 +119,11 @@
82119
<Folder Include="Properties\" />
83120
</ItemGroup>
84121
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
122+
<Import Project="..\..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" />
123+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
124+
<PropertyGroup>
125+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
126+
</PropertyGroup>
127+
<Error Condition="!Exists('..\..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Data.SqlClient.SNI.1.1.0\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
128+
</Target>
85129
</Project>

sample/AppConfigDemo/packages.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Microsoft.Data.SqlClient" version="1.1.3" targetFramework="net461" />
4+
<package id="Microsoft.Data.SqlClient.SNI" version="1.1.0" targetFramework="net461" />
35
<package id="Microsoft.Extensions.Configuration.Abstractions" version="3.1.4" targetFramework="net461" />
46
<package id="Microsoft.Extensions.Primitives" version="3.1.4" targetFramework="net461" />
7+
<package id="Microsoft.Identity.Client" version="3.0.8" targetFramework="net461" />
8+
<package id="Microsoft.IdentityModel.JsonWebTokens" version="5.5.0" targetFramework="net461" />
9+
<package id="Microsoft.IdentityModel.Logging" version="5.5.0" targetFramework="net461" />
10+
<package id="Microsoft.IdentityModel.Protocols" version="5.5.0" targetFramework="net461" />
11+
<package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.5.0" targetFramework="net461" />
12+
<package id="Microsoft.IdentityModel.Tokens" version="5.5.0" targetFramework="net461" />
13+
<package id="Newtonsoft.Json" version="10.0.1" targetFramework="net461" />
514
<package id="Serilog" version="2.9.0" targetFramework="net461" />
615
<package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net461" />
716
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
17+
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
18+
<package id="System.IdentityModel.Tokens.Jwt" version="5.5.0" targetFramework="net461" />
819
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
920
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
1021
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net461" />

0 commit comments

Comments
 (0)