Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc0bc846

Browse files
mdaigleMichelZ
andauthored
Synchronize versions/packages across nuspec and ref project (#3045) (#3049)
Add .NET9Co-authored-by: Michel Zehnder <MichelZ@users.noreply.github.com>
1 parent2881205 commitc0bc846

File tree

3 files changed

+61
-7
lines changed

3 files changed

+61
-7
lines changed

‎src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,7 @@
3434
<PackageReferenceInclude="Microsoft.IdentityModel.Protocols.OpenIdConnect"Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
3535
<PackageReferenceInclude="Microsoft.IdentityModel.JsonWebTokens"Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
3636
<PackageReferenceInclude="System.Configuration.ConfigurationManager"Version="$(SystemConfigurationConfigurationManagerVersion)" />
37+
<PackageReferenceInclude="System.Security.Cryptography.Pkcs"Version="$(SystemSecurityCryptographyPkcsVersion)" />
38+
<PackageReferenceInclude="Microsoft.Bcl.Cryptography"Version="$(MicrosoftBclCryptographyVersion)" />
3739
</ItemGroup>
3840
</Project>

‎src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,7 @@
4444
<PackageReferenceInclude="Microsoft.IdentityModel.JsonWebTokens"Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
4545
<PackageReferenceInclude="System.Buffers"Version="$(SystemBuffersVersion)" />
4646
<PackageReferenceInclude="System.Text.Json"Version="$(SystemTextJsonVersion)" />
47+
<PackageReferenceInclude="System.Security.Cryptography.Pkcs"Version="$(SystemSecurityCryptographyPkcsVersion)" />
48+
<PackageReferenceInclude="Microsoft.Bcl.Cryptography"Version="$(MicrosoftBclCryptographyVersion)" />
4749
</ItemGroup>
4850
</Project>

‎tools/specs/Microsoft.Data.SqlClient.nuspec

Lines changed: 57 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,36 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
3131
<grouptargetFramework="net462">
3232
<dependencyid="Microsoft.Data.SqlClient.SNI"version="6.0.0-preview1.24226.4" />
3333
<dependencyid="Azure.Identity"version="1.11.4" />
34-
<dependencyid="Microsoft.Extensions.Caching.Memory"version="6.0.1"exclude="Compile" />
34+
<dependencyid="Microsoft.Extensions.Caching.Memory"version="9.0.0"exclude="Compile" />
3535
<dependencyid="Microsoft.IdentityModel.JsonWebTokens"version="7.5.0" />
3636
<dependencyid="Microsoft.IdentityModel.Protocols.OpenIdConnect"version="7.5.0" />
3737
<dependencyid="System.Buffers"version="4.5.1" />
3838
<dependencyid="System.Text.Encodings.Web"version="6.0.0" />
3939
<dependencyid="System.Text.Json"version="6.0.10" />
40+
<dependencyid="System.Security.Cryptography.Pkcs"version="9.0.0"/>
41+
<dependencyid="Microsoft.Bcl.Cryptography"version="9.0.0"/>
4042
</group>
4143
<grouptargetFramework="net8.0">
4244
<dependencyid="Microsoft.Data.SqlClient.SNI.runtime"version="6.0.0-preview1.24226.4"exclude="Compile" />
4345
<dependencyid="Azure.Identity"version="1.11.4" />
44-
<dependencyid="Microsoft.Extensions.Caching.Memory"version="8.0.1"exclude="Compile" />
46+
<dependencyid="Microsoft.Extensions.Caching.Memory"version="9.0.0"exclude="Compile" />
4547
<dependencyid="Microsoft.IdentityModel.JsonWebTokens"version="7.5.0" />
4648
<dependencyid="Microsoft.IdentityModel.Protocols.OpenIdConnect"version="7.5.0" />
4749
<dependencyid="Microsoft.SqlServer.Server"version="1.0.0"/>
48-
<dependencyid="System.Configuration.ConfigurationManager"version="8.0.1"exclude="Compile" />
50+
<dependencyid="System.Configuration.ConfigurationManager"version="9.0.0"exclude="Compile" />
51+
<dependencyid="System.Security.Cryptography.Pkcs"version="9.0.0"/>
52+
<dependencyid="Microsoft.Bcl.Cryptography"version="9.0.0"/>
53+
</group>
54+
<grouptargetFramework="net9.0">
55+
<dependencyid="Microsoft.Data.SqlClient.SNI.runtime"version="6.0.0-preview1.24226.4"exclude="Compile" />
56+
<dependencyid="Azure.Identity"version="1.11.4" />
57+
<dependencyid="Microsoft.Extensions.Caching.Memory"version="9.0.0"exclude="Compile" />
58+
<dependencyid="Microsoft.IdentityModel.JsonWebTokens"version="7.5.0" />
59+
<dependencyid="Microsoft.IdentityModel.Protocols.OpenIdConnect"version="7.5.0" />
60+
<dependencyid="Microsoft.SqlServer.Server"version="1.0.0"/>
61+
<dependencyid="System.Configuration.ConfigurationManager"version="9.0.0"exclude="Compile" />
62+
<dependencyid="System.Security.Cryptography.Pkcs"version="9.0.0"/>
63+
<dependencyid="Microsoft.Bcl.Cryptography"version="9.0.0"/>
4964
</group>
5065
</dependencies>
5166
<frameworkAssemblies>
@@ -61,6 +76,10 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
6176
<referencefile="Microsoft.Data.SqlClient.dll" />
6277
<referencefile="Microsoft.Data.SqlClient.xml" />
6378
</group>
79+
<grouptargetFramework="net9.0">
80+
<referencefile="Microsoft.Data.SqlClient.dll" />
81+
<referencefile="Microsoft.Data.SqlClient.xml" />
82+
</group>
6483
</references>
6584
</metadata>
6685
<files>
@@ -71,10 +90,14 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
7190
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$\Microsoft.Data.SqlClient\ref\net462\Microsoft.Data.SqlClient.dll"target="ref\net462\"exclude="" />
7291
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$\Microsoft.Data.SqlClient\ref\net462\Microsoft.Data.SqlClient.xml"target="ref\net462\"exclude="" />
7392

74-
<!-- ref NetCore-->
93+
<!-- ref NetCorefor Net 8-->
7594
<filesrc="..\..\artifacts\Project\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\net8.0\Microsoft.Data.SqlClient.dll"target="ref\net8.0\"exclude="" />
7695
<filesrc="..\..\artifacts\Project\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\net8.0\Microsoft.Data.SqlClient.xml"target="ref\net8.0\"exclude="" />
7796

97+
<!-- ref NetCore for Net 9-->
98+
<filesrc="..\..\artifacts\Project\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\net9.0\Microsoft.Data.SqlClient.dll"target="ref\net9.0\"exclude="" />
99+
<filesrc="..\..\artifacts\Project\bin\AnyOS\$Configuration$\Microsoft.Data.SqlClient\ref\net9.0\Microsoft.Data.SqlClient.xml"target="ref\net9.0\"exclude="" />
100+
78101
<!-- Localized Resource Files for NetFx-->
79102
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\cs\Microsoft.Data.SqlClient.resources.dll"target="lib\net462\cs\"exclude="" />
80103
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\de\Microsoft.Data.SqlClient.resources.dll"target="lib\net462\de\"exclude="" />
@@ -95,12 +118,17 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
95118
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.pdb"target="lib\net462\"exclude="" />
96119
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.xml"target="lib\net462\"exclude="" />
97120

98-
<!-- lib NetCore-->
121+
<!-- lib NetCorefor Net 8-->
99122
<filesrc="..\..\artifacts\Project\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.dll"target="lib\net8.0\"exclude="" />
100123
<filesrc="..\..\artifacts\Project\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.pdb"target="lib\net8.0\"exclude="" />
101124
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.xml"target="lib\net8.0\"exclude="" />
102125

103-
<!-- Localization files for Net 8-->
126+
<!-- lib NetCore for Net 9-->
127+
<filesrc="..\..\artifacts\Project\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.dll"target="lib\net9.0\"exclude="" />
128+
<filesrc="..\..\artifacts\Project\bin\AnyOS\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.pdb"target="lib\net9.0\"exclude="" />
129+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.xml"target="lib\net9.0\"exclude="" />
130+
131+
<!-- Localization files for Net 8-->
104132
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\cs\Microsoft.Data.SqlClient.resources.dll"target="lib\net8.0\cs\"exclude="" />
105133
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\de\Microsoft.Data.SqlClient.resources.dll"target="lib\net8.0\de\"exclude="" />
106134
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\es\Microsoft.Data.SqlClient.resources.dll"target="lib\net8.0\es\"exclude="" />
@@ -116,14 +144,36 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
116144
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll"target="lib\net8.0\zh-Hant\"exclude="" />
117145
<!-- End of Localization files for Net 8-->
118146

147+
<!-- Localization files for Net 9-->
148+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\cs\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\cs\"exclude="" />
149+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\de\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\de\"exclude="" />
150+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\es\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\es\"exclude="" />
151+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\fr\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\fr\"exclude="" />
152+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\it\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\it\"exclude="" />
153+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\ja\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\ja\"exclude="" />
154+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\ko\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\ko\"exclude="" />
155+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\pl\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\pl\"exclude="" />
156+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\pt-BR\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\pt-BR\"exclude="" />
157+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\ru\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\ru\"exclude="" />
158+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\tr\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\tr\"exclude="" />
159+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\zh-Hans\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\zh-Hans\"exclude="" />
160+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\zh-Hant\Microsoft.Data.SqlClient.resources.dll"target="lib\net9.0\zh-Hant\"exclude="" />
161+
<!-- End of Localization files for Net 9-->
162+
119163
<!-- runtimes NetFx-->
120164
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.dll"target="runtimes\win\lib\net462\"exclude="" />
121165
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netfx\net462\Microsoft.Data.SqlClient.pdb"target="runtimes\win\lib\net462\"exclude="" />
122166

123-
<!-- runtimes NetCore-->
167+
<!-- runtimes NetCorefor Net 8-->
124168
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.dll"target="runtimes\win\lib\net8.0\"exclude="" />
125169
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.pdb"target="runtimes\win\lib\net8.0\"exclude="" />
126170
<filesrc="..\..\artifacts\Project\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.dll"target="runtimes\unix\lib\net8.0\"exclude="" />
127171
<filesrc="..\..\artifacts\Project\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net8.0\Microsoft.Data.SqlClient.pdb"target="runtimes\unix\lib\net8.0\"exclude="" />
172+
173+
<!-- runtimes NetCore for Net 9-->
174+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.dll"target="runtimes\win\lib\net9.0\"exclude="" />
175+
<filesrc="..\..\artifacts\Project\bin\Windows_NT\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.pdb"target="runtimes\win\lib\net9.0\"exclude="" />
176+
<filesrc="..\..\artifacts\Project\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.dll"target="runtimes\unix\lib\net9.0\"exclude="" />
177+
<filesrc="..\..\artifacts\Project\bin\Unix\$Configuration$.AnyCPU\Microsoft.Data.SqlClient\netcore\net9.0\Microsoft.Data.SqlClient.pdb"target="runtimes\unix\lib\net9.0\"exclude="" />
128178
</files>
129179
</package>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp