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

Commit8ef005a

Browse files
authored
Build Tweaks for Onboarding (#2366)
1 parent64bfe50 commit8ef005a

File tree

6 files changed

+49
-28
lines changed

6 files changed

+49
-28
lines changed

‎src/Directory.Build.props

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,10 @@
9595
<ImportProject="$(ToolsDir)props\Tools.props" />
9696
<!-- Provides Build properties-->
9797
<ImportProject="$(ToolsDir)props\AssemblyInfo.props" />
98-
<ImportProject="$(ToolsDir)props\AssemblyRef.props" />
98+
<ImportProject="$(ToolsDir)props\AssemblyRef.props" />
99+
100+
<!-- Fix GetTargetPath issues - see https://github.com/dotnet/msbuild/issues/4303#issuecomment-482345617-->
101+
<PropertyGroup>
102+
<AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
103+
</PropertyGroup>
99104
</Project>

‎src/Microsoft.Data.SqlClient.sln

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ EndProject
7878
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Microsoft.Data.Sql","Microsoft.Data.Sql","{0CE216CE-8072-4985-B248-61F0D0BE9C2E}"
7979
ProjectSection(SolutionItems) =preProject
8080
..\doc\snippets\Microsoft.Data.Sql\SqlNotificationRequest.xml= ..\doc\snippets\Microsoft.Data.Sql\SqlNotificationRequest.xml
81+
..\doc\snippets\Microsoft.Data.Sql\SqlDataSourceEnumerator.xml= ..\doc\snippets\Microsoft.Data.Sql\SqlDataSourceEnumerator.xml
8182
EndProjectSection
8283
EndProject
8384
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Microsoft.Data.SqlClient","Microsoft.Data.SqlClient","{C05F4FFE-6A14-4409-AA0A-10630BE4F1EE}"
@@ -142,6 +143,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlClient",
142143
..\doc\snippets\Microsoft.Data.SqlClient\SqlRowUpdatingEventArgs.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlRowUpdatingEventArgs.xml
143144
..\doc\snippets\Microsoft.Data.SqlClient\SqlRowUpdatingEventHandler.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlRowUpdatingEventHandler.xml
144145
..\doc\snippets\Microsoft.Data.SqlClient\SqlTransaction.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlTransaction.xml
146+
..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyColumnOrderHint.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyColumnOrderHint.xml
147+
..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyColumnOrderHintCollection.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlBulkCopyColumnOrderHintCollection.xml
148+
..\doc\snippets\Microsoft.Data.SqlClient\SqlConfigurableRetryFactory.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlConfigurableRetryFactory.xml
149+
..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionIPAddressPreference.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionIPAddressPreference.xml
150+
..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionOverrides.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionOverrides.xml
151+
..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryingEventArgs.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryingEventArgs.xml
152+
..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryIntervalBaseEnumerator.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryIntervalBaseEnumerator.xml
153+
..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryLogicBase.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryLogicBase.xml
154+
..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryLogicBaseProvider.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryLogicBaseProvider.xml
155+
..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryLogicOption.xml= ..\doc\snippets\Microsoft.Data.SqlClient\SqlRetryLogicOption.xml
145156
EndProjectSection
146157
EndProject
147158
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Microsoft.Data.SqlClient.DataClassification","Microsoft.Data.SqlClient.DataClassification","{5D1F0032-7B0D-4FB6-A969-FCFB25C9EA1D}"
@@ -151,22 +162,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlClient.Da
151162
..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\Label.xml= ..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\Label.xml
152163
..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\SensitivityClassification.xml= ..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\SensitivityClassification.xml
153164
..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\SensitivityProperty.xml= ..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\SensitivityProperty.xml
165+
..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\SensitivityRank.xml= ..\doc\snippets\Microsoft.Data.SqlClient.DataClassification\SensitivityRank.xml
154166
EndProjectSection
155167
EndProject
156168
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Microsoft.Data.SqlClient.Server","Microsoft.Data.SqlClient.Server","{650EB7FA-EB0D-4F8E-AB2C-161C3AD8E363}"
157169
ProjectSection(SolutionItems) =preProject
158-
..\doc\snippets\Microsoft.Data.SqlClient.Server\DataAccessKind.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\DataAccessKind.xml
159-
..\doc\snippets\Microsoft.Data.SqlClient.Server\Format.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\Format.xml
160-
..\doc\snippets\Microsoft.Data.SqlClient.Server\IBinarySerialize.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\IBinarySerialize.xml
161-
..\doc\snippets\Microsoft.Data.SqlClient.Server\InvalidUdtException.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\InvalidUdtException.xml
162170
..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlDataRecord.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlDataRecord.xml
163-
..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlFacetAttribute.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlFacetAttribute.xml
164-
..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlFunctionAttribute.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlFunctionAttribute.xml
165171
..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlMetaData.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlMetaData.xml
166-
..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlMethodAttribute.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlMethodAttribute.xml
167-
..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlUserDefinedAggregateAttribute.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlUserDefinedAggregateAttribute.xml
168-
..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlUserDefinedTypeAttribute.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\SqlUserDefinedTypeAttribute.xml
169-
..\doc\snippets\Microsoft.Data.SqlClient.Server\SystemDataAccessKind.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\SystemDataAccessKind.xml
170172
..\doc\snippets\Microsoft.Data.SqlClient.Server\TriggerAction.xml= ..\doc\snippets\Microsoft.Data.SqlClient.Server\TriggerAction.xml
171173
EndProjectSection
172174
EndProject
@@ -197,9 +199,29 @@ EndProject
197199
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="Microsoft.Data.SqlClient.PerformanceTests","Microsoft.Data.SqlClient\tests\PerformanceTests\Microsoft.Data.SqlClient.PerformanceTests.csproj","{599A336B-2A5F-473D-8442-1223ED37C93E}"
198200
EndProject
199201
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="src","src","{4F3CD363-B1E6-4D6D-9466-97D78A56BE45}"
202+
ProjectSection(SolutionItems) =preProject
203+
Directory.Build.props=Directory.Build.props
204+
NuGet.config=NuGet.config
205+
EndProjectSection
200206
EndProject
201207
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="Microsoft.SqlServer.Server","Microsoft.SqlServer.Server\Microsoft.SqlServer.Server.csproj","{A314812A-7820-4565-A2A8-ABBE391C11E4}"
202208
EndProject
209+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Microsoft.SqlServer.Server","Microsoft.SqlServer.Server","{869A9BCC-D303-4365-9BF7-958CD6387916}"
210+
ProjectSection(SolutionItems) =preProject
211+
..\doc\snippets\Microsoft.SqlServer.Server\DataAccessKind.xml= ..\doc\snippets\Microsoft.SqlServer.Server\DataAccessKind.xml
212+
..\doc\snippets\Microsoft.SqlServer.Server\Format.xml= ..\doc\snippets\Microsoft.SqlServer.Server\Format.xml
213+
..\doc\snippets\Microsoft.SqlServer.Server\IBinarySerialize.xml= ..\doc\snippets\Microsoft.SqlServer.Server\IBinarySerialize.xml
214+
..\doc\snippets\Microsoft.SqlServer.Server\InvalidUdtException.xml= ..\doc\snippets\Microsoft.SqlServer.Server\InvalidUdtException.xml
215+
..\doc\snippets\Microsoft.SqlServer.Server\SqlFacetAttribute.xml= ..\doc\snippets\Microsoft.SqlServer.Server\SqlFacetAttribute.xml
216+
..\doc\snippets\Microsoft.SqlServer.Server\SqlFunctionAttribute.xml= ..\doc\snippets\Microsoft.SqlServer.Server\SqlFunctionAttribute.xml
217+
..\doc\snippets\Microsoft.SqlServer.Server\SqlMethodAttribute.xml= ..\doc\snippets\Microsoft.SqlServer.Server\SqlMethodAttribute.xml
218+
..\doc\snippets\Microsoft.SqlServer.Server\SqlUserDefinedAggregateAttribute.xml= ..\doc\snippets\Microsoft.SqlServer.Server\SqlUserDefinedAggregateAttribute.xml
219+
..\doc\snippets\Microsoft.SqlServer.Server\SqlUserDefinedTypeAttribute.xml= ..\doc\snippets\Microsoft.SqlServer.Server\SqlUserDefinedTypeAttribute.xml
220+
..\doc\snippets\Microsoft.SqlServer.Server\SystemDataAccessKind.xml= ..\doc\snippets\Microsoft.SqlServer.Server\SystemDataAccessKind.xml
221+
EndProjectSection
222+
EndProject
223+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="TestClr","TestClr","{CDE508A5-F5D0-4A59-A4EF-978833830727}"
224+
EndProject
203225
Global
204226
GlobalSection(SolutionConfigurationPlatforms) =preSolution
205227
Debug|Any CPU=Debug|Any CPU
@@ -483,11 +505,7 @@ Global
483505
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9} ={0CC4817A-12F3-4357-912C-09315FAAD008}
484506
{D2D1E2D1-B6E0-489F-A36D-1F3047AB87B9} ={0CC4817A-12F3-4357-912C-09315FAAD008}
485507
{37431336-5307-4184-9356-C4B7E47DC714} ={28E5EFE6-C9DD-4FF9-9FEC-532F72DFFA6E}
486-
{D1392B54-998A-4F27-BC17-4CE149117BCC} ={0CC4817A-12F3-4357-912C-09315FAAD008}
487508
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5} ={0CC4817A-12F3-4357-912C-09315FAAD008}
488-
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F} ={0CC4817A-12F3-4357-912C-09315FAAD008}
489-
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E} ={0CC4817A-12F3-4357-912C-09315FAAD008}
490-
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E} ={0CC4817A-12F3-4357-912C-09315FAAD008}
491509
{A2E7E470-5EFF-4828-B55E-FCBA3650F51C} ={28E5EFE6-C9DD-4FF9-9FEC-532F72DFFA6E}
492510
{1C9FC4B8-54BC-4B6C-BB3A-F5CD59D80A9B} ={A2E7E470-5EFF-4828-B55E-FCBA3650F51C}
493511
{771F3F1E-7A68-4A9D-ADA8-A24F1D5BE71D} ={3FDD425C-FE01-4B56-863E-1FCDD0677CF5}
@@ -507,6 +525,12 @@ Global
507525
{B93A3149-67E8-491E-A1E5-19D65F9D9E98} ={0CC4817A-12F3-4357-912C-09315FAAD008}
508526
{599A336B-2A5F-473D-8442-1223ED37C93E} ={0CC4817A-12F3-4357-912C-09315FAAD008}
509527
{A314812A-7820-4565-A2A8-ABBE391C11E4} ={4F3CD363-B1E6-4D6D-9466-97D78A56BE45}
528+
{869A9BCC-D303-4365-9BF7-958CD6387916} ={71F356DC-DFA3-4163-8BFE-D268722CE189}
529+
{CDE508A5-F5D0-4A59-A4EF-978833830727} ={0CC4817A-12F3-4357-912C-09315FAAD008}
530+
{D1392B54-998A-4F27-BC17-4CE149117BCC} ={CDE508A5-F5D0-4A59-A4EF-978833830727}
531+
{6C88F00F-9597-43AD-9E5F-9B344DA3B16F} ={CDE508A5-F5D0-4A59-A4EF-978833830727}
532+
{B73A7063-37C3-415D-AD53-BB3DA20ABD6E} ={CDE508A5-F5D0-4A59-A4EF-978833830727}
533+
{E0A6BB21-574B-43D9-890D-6E1144F2EE9E} ={CDE508A5-F5D0-4A59-A4EF-978833830727}
510534
EndGlobalSection
511535
GlobalSection(ExtensibilityGlobals) =postSolution
512536
SolutionGuid ={01D48116-37A2-4D33-B9EC-94793C702431}

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumerator.Windows.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespaceMicrosoft.Data.Sql
99
{
10-
/// <include file='../../../../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml' path='docs/members[@name="SqlDataSourceEnumerator"]/SqlDataSourceEnumerator/*' />
10+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml' path='docs/members[@name="SqlDataSourceEnumerator"]/SqlDataSourceEnumerator/*' />
1111
publicsealedpartialclassSqlDataSourceEnumerator:DbDataSourceEnumerator
1212
{
1313
privatepartialDataTableGetDataSourcesInternal()

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumerator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77

88
namespaceMicrosoft.Data.Sql
99
{
10-
/// <include file='../../../../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml' path='docs/members[@name="SqlDataSourceEnumerator"]/SqlDataSourceEnumerator/*' />
10+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml' path='docs/members[@name="SqlDataSourceEnumerator"]/SqlDataSourceEnumerator/*' />
1111
publicsealedpartialclassSqlDataSourceEnumerator:DbDataSourceEnumerator
1212
{
1313
privatestaticreadonlyLazy<SqlDataSourceEnumerator>s_singletonInstance=new(()=>newSqlDataSourceEnumerator());
1414

1515
privateSqlDataSourceEnumerator():base(){}
1616

17-
/// <include file='../../../../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml' path='docs/members[@name="SqlDataSourceEnumerator"]/Instance/*' />
17+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml' path='docs/members[@name="SqlDataSourceEnumerator"]/Instance/*' />
1818
publicstaticSqlDataSourceEnumeratorInstance=>s_singletonInstance.Value;
1919

20-
/// <include file='../../../../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml' path='docs/members[@name="SqlDataSourceEnumerator"]/GetDataSources/*' />
20+
/// <include file='../../../../../../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml' path='docs/members[@name="SqlDataSourceEnumerator"]/GetDataSources/*' />
2121
overridepublicDataTableGetDataSources()=>GetDataSourcesInternal();
2222

2323
privatepartialDataTableGetDataSourcesInternal();

‎src/Microsoft.Data.SqlClient/tests/NuGet.config

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

‎src/NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<addkey="dotnet-public"value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
5+
<addkey="sqlclient"value="https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/sqlclient/nuget/v3/index.json" />
66
</packageSources>
77
</configuration>

0 commit comments

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