Skip to content

Commit 6db52a6

Browse files
benrr101benrr101
authored
Merge | Cleanup (#4145)
* Delete separate projects ... this was less satisfying than I expected it'd be * Test output should go to the same folder as the project ... no need to give it a special place. * Drop targets that aren't necessary from build.proj * Remove extraneous properties from build.proj * Remove unused targets * Test project references from RepoRoot * Remove unnecessary stuff from Directory.Build.props * Drop some more unnecessary files * Remove references to BuildAllConfigurations * 🤖 Remove separate project stuff from CompareMdsRefAssemblies.targets
1 parent 8fc7154 commit 6db52a6

30 files changed

Lines changed: 132 additions & 3110 deletions

‎build.proj‎

Lines changed: 11 additions & 285 deletions
Large diffs are not rendered by default.

‎eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
# via the msBuildArguments parameter.
1111
# It uses the RoslynAnalyzers@3 task from the Secure Development Team's SDL
1212
# extension:
13-
#
1413
# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-mohanb/security-integration/guardian-wiki/sdl-azdo-extension/roslyn-analyzers-build-task
1514
#
16-
# GOTCHA: This step will clobber any existing build output. It should be run
15+
# GOTCHA: This step will clobber any existing build output. It should be run
1716
# _before_ any build steps that perform versioning or signing.
1817

1918
parameters:

‎src/Directory.Build.props‎

Lines changed: 17 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<TargetsWindows Condition="'$(OS)' == 'Windows_NT' AND '$(OSGroup)' == ''">true</TargetsWindows>
5-
<TargetsWindows Condition="'$(OS)' != 'Windows_NT' AND '$(OSGroup)' == ''">false</TargetsWindows>
6-
<TargetsWindows Condition="'$(OSGroup)' == 'Windows_NT'">true</TargetsWindows>
7-
<TargetsUnix Condition="'$(OS)' == 'Unix' AND '$(OSGroup)' == ''">true</TargetsUnix>
8-
<TargetsUnix Condition="'$(OS)' != 'Unix' AND '$(OSGroup)' == ''">false</TargetsUnix>
9-
<TargetsUnix Condition="'$(OSGroup)' == 'Unix'">true</TargetsUnix>
10-
<TargetsAnyOS Condition="'$(OSGroup)' == 'AnyOS'">true</TargetsAnyOS>
11-
<IsSourceProject Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(MSBuildProjectDirectory), 'src%24'))">true</IsSourceProject>
124
<!--
135
"ReferenceType" property supports below options:
146
@@ -19,54 +11,32 @@
1911
-->
2012
<ReferenceType Condition="'$(ReferenceType)' == ''">Project</ReferenceType>
2113
</PropertyGroup>
14+
15+
<!-- @TODO: What is this? -->
2216
<PropertyGroup Condition="$(BuildForRelease) == 'true'">
2317
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
2418
</PropertyGroup>
19+
2520
<ItemGroup Condition="$(BuildForRelease) == 'true'">
2621
<SourceRoot Include="$(MSBuildThisFileDirectory)/" />
2722
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
2823
</ItemGroup>
24+
2925
<PropertyGroup Condition="$(Configuration.Contains('Debug'))">
3026
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
3127
</PropertyGroup>
3228
<PropertyGroup>
3329
<ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
3430
<RepoRoot>$(ProjectDir)..\</RepoRoot>
3531
<Artifacts>$(RepoRoot)artifacts\$(ReferenceType)\</Artifacts>
36-
<ToolsArtifactsDir Condition="'$(ToolsArtifactsDir)'==''">$(Artifacts)tools\</ToolsArtifactsDir>
37-
<ManagedSourceCode>$(ProjectDir)Microsoft.Data.SqlClient\</ManagedSourceCode>
38-
<SqlServerSourceCode>$(ProjectDir)Microsoft.SqlServer.Server\</SqlServerSourceCode>
39-
<NetCoreSource>$(ManagedSourceCode)netcore\</NetCoreSource>
40-
<NetCoreResources>$(ManagedSourceCode)src\Resources\</NetCoreResources>
41-
<ResxFileName>Strings</ResxFileName>
42-
<ResourceFileName>SqlClient.Resources.$(ResxFileName)</ResourceFileName>
43-
<GeneratedSourceFileName>$(ResxFileName).ResourceNames.cs</GeneratedSourceFileName>
44-
<NetFxSource>$(ManagedSourceCode)netfx\</NetFxSource>
45-
<NetFxResources>$(ManagedSourceCode)src\Resources\</NetFxResources>
46-
<AddOnsPath>$(ManagedSourceCode)add-ons\</AddOnsPath>
47-
<SqlServerSource>$(RepoRoot)src\Microsoft.SqlServer.Server\</SqlServerSource>
48-
<CommonsourceRoot>$(RepoRoot)src\Microsoft.Data.SqlClient\src\</CommonsourceRoot>
49-
<ObjFolder>$(Artifacts)obj\</ObjFolder>
50-
<CommonPath>$(NetCoreSource)src\Common\src</CommonPath>
51-
<CommonTestPath>$(NetCoreSource)src\Common\tests</CommonTestPath>
52-
<TestsPath>$(ProjectDir)Microsoft.Data.SqlClient/tests/</TestsPath>
53-
<BinFolder Condition="'$(TargetsWindows)' == 'true'">$(Artifacts)bin\Windows_NT\</BinFolder>
54-
<BinFolder Condition="'$(TargetsAnyOS)' == 'true'">$(Artifacts)bin\AnyOS\</BinFolder>
55-
<BinFolder Condition="'$(TargetsUnix)' == 'true'">$(Artifacts)bin\Unix\</BinFolder>
32+
5633
<ToolsDir Condition="'$(ToolsDir)'==''">$(RepoRoot)tools\</ToolsDir>
57-
<GenAPISrcDir Condition="'$(GenAPISrcDir)'==''">$(ToolsDir)GenAPI\</GenAPISrcDir>
5834
<PackagesDir Condition="'$(PackagesDir)'==''">$(RepoRoot)packages\</PackagesDir>
59-
<NuGetRoot Condition="'$(NuGetRoot)' == ''">$(RepoRoot).nuget\</NuGetRoot>
60-
<NuGetCmd>$(NuGetRoot)nuget.exe</NuGetCmd>
6135
<!-- Respect environment variable for the .NET install directory if set; otherwise, use the current default location -->
6236
<BuildSimulator Condition="'$(BuildSimulator)' != 'true'">false</BuildSimulator>
6337
</PropertyGroup>
6438

65-
<!-- Add user-supplied define constants. -->
66-
<PropertyGroup Condition="'$(UserDefinedConstants)' != ''">
67-
<DefineConstants>$(DefineConstants);$(UserDefinedConstants)</DefineConstants>
68-
</PropertyGroup>
69-
39+
<!-- @TODO: This isn't being set anywhere -->
7040
<PropertyGroup Condition="'$(BuildSimulator)' == 'true'">
7141
<DefineConstants>$(DefineConstants);ENCLAVE_SIMULATOR</DefineConstants>
7242
</PropertyGroup>
@@ -98,18 +68,15 @@
9868
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9969

10070
<!--
101-
There may be a few specific warnings that should _not_ be considered an
102-
error. This list should be used sparingly to avoid important warnings
103-
being ignored.
71+
There may be a few specific warnings that should _not_ be considered an error. This list
72+
should be used sparingly to avoid important warnings being ignored.
10473
-->
105-
<WarningsNotAsErrors></WarningsNotAsErrors>
74+
<WarningsNotAsErrors />
10675

10776
<!--
108-
If a build is failing due to vulnerable dependencies, you may temporarily
109-
uncomment the following line to treat the audit warnings as non-errors.
110-
This should only be done as a temporary measure while addressing the
111-
vulnerable dependencies. See:
112-
77+
If a build is failing due to vulnerable dependencies, you may temporarily uncomment the
78+
following line to treat the audit warnings as non-errors. This should only be done as a
79+
temporary measure while addressing the vulnerable dependencies. See:
11380
https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1901-nu1904
11481
-->
11582
<!-- <WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors> -->
@@ -126,7 +93,7 @@
12693
<DefineConstants>$(DefineConstants);STRONG_NAME_SIGNING</DefineConstants>
12794
</PropertyGroup>
12895

129-
<!-- Packaging for source link-->
96+
<!-- Packaging for source link-->
13097
<PropertyGroup>
13198
<DebugType>portable</DebugType>
13299
<DebugSymbols>true</DebugSymbols>
@@ -135,14 +102,10 @@
135102
<EmbedUnTrackedSources>true</EmbedUnTrackedSources>
136103
<DisableSourceLinkTranslation Condition="'$(DisableSourceLinkTranslation)' == ''">false</DisableSourceLinkTranslation>
137104
</PropertyGroup>
138-
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
139-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
140-
</PropertyGroup>
141105

142106
<!-- Provides Version properties -->
143107
<Import Project="$(ToolsDir)props\Versions.props" />
144-
<!-- Provides Tool properties -->
145-
<Import Project="$(ToolsDir)props\Tools.props" />
108+
146109
<!-- Provides Build properties -->
147110
<Import Project="$(ToolsDir)props\AssemblyInfo.props" />
148111
<Import Project="$(ToolsDir)props\AssemblyRef.props" />
@@ -154,20 +117,15 @@
154117
</PropertyGroup>
155118

156119
<!--
157-
We want to use the latest C# language regardless of target framework,
158-
so we explicitly set LangVersion for all targets.
159-
160-
We will roll this version forward as new C# language versions are released
161-
and associated with the newest .NET SDK we support.
120+
We want to use the latest C# language regardless of target framework, so we explicitly set
121+
LangVersion for all targets. We will roll this version forward as new C# language versions are
122+
released and associated with the newest .NET SDK we support.
162123
163124
Details here:
164-
165125
https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/language-versioning
166-
167126
https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/configure-language-version
168127
-->
169128
<PropertyGroup>
170-
<!-- The newest .NET SDK we support is .NET 10.0, which uses C# 14 -->
171129
<LangVersion>14</LangVersion>
172130
</PropertyGroup>
173131
</Project>

‎src/Microsoft.Data.SqlClient.slnx‎

Lines changed: 23 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
<Platform Solution="*|x86" Project="x86" />
1111
</Project>
1212
</Folder>
13+
<Folder Name="/doc/apps/">
14+
<Project Path="../doc/apps/AzureAuthentication/AzureAuthentication.csproj" />
15+
</Folder>
1316
<Folder Name="/doc/snippets/" />
1417
<Folder Name="/doc/snippets/Microsoft.Data.Sql/">
1518
<File Path="../doc/snippets/Microsoft.Data.Sql/SqlDataSourceEnumerator.xml" />
@@ -130,30 +133,27 @@
130133
<Build Project="false" />
131134
</Project>
132135
</Folder>
133-
<Folder Name="/Microsoft.Data.SqlClient.Extensions/" />
134-
<Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/" />
135-
<Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/src/">
136-
<Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
136+
<Folder Name="/src/">
137+
<File Path="Directory.Build.props" />
138+
</Folder>
139+
<Folder Name="/src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/">
140+
<Project Path="Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
137141
</Folder>
138-
<Folder Name="/Microsoft.Data.SqlClient.Extensions/Abstractions/test/">
142+
<Folder Name="/src/Microsoft.Data.SqlClient.Extensions.Abstractions/">
143+
<Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
139144
<Project Path="Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj" />
140145
</Folder>
141-
<Folder Name="/Microsoft.Data.SqlClient.Extensions/Azure/" />
142-
<Folder Name="/Microsoft.Data.SqlClient.Extensions/Azure/src/">
146+
<Folder Name="/src/Microsoft.Data.SqlClient.Extensions.Azure/">
143147
<Project Path="Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj" />
144-
</Folder>
145-
<Folder Name="/Microsoft.Data.SqlClient.Extensions/Azure/test/">
146148
<Project Path="Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj" />
147149
</Folder>
148-
<Folder Name="/Microsoft.Data.SqlClient.Internal/" />
149-
<Folder Name="/Microsoft.Data.SqlClient.Internal/Logging/" />
150-
<Folder Name="/Microsoft.Data.SqlClient.Internal/Logging/src/">
150+
<Folder Name="/src/Microsoft.Data.SqlClient.Internal.Logging/">
151151
<Project Path="Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj" />
152152
</Folder>
153-
<Folder Name="/Microsoft.Data.SqlClient/">
153+
<Folder Name="/src/Microsoft.Data.SqlClient/">
154154
<File Path="Microsoft.Data.SqlClient/MdsVersions.props" />
155155
</Folder>
156-
<Folder Name="/Microsoft.Data.SqlClient/notsupported/">
156+
<Folder Name="/src/Microsoft.Data.SqlClient/notsupported/">
157157
<Project Path="../tools/GenAPI/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj">
158158
<Build Project="false" />
159159
</Project>
@@ -164,51 +164,30 @@
164164
<Build Project="false" />
165165
</Project>
166166
</Folder>
167-
<Folder Name="/Microsoft.Data.SqlClient/ref/">
167+
<Folder Name="/src/Microsoft.Data.SqlClient/ref/">
168168
<Project Path="Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj" />
169169
</Folder>
170-
<Folder Name="/Microsoft.Data.SqlClient/src/">
170+
<Folder Name="/src/Microsoft.Data.SqlClient/src/">
171171
<Project Path="Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj" />
172172
</Folder>
173-
<Folder Name="/Microsoft.Data.SqlClient/tests/" />
174-
<Folder Name="/src/">
175-
<File Path="Directory.Build.props" />
176-
<Project Path="Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj">
177-
<BuildDependency Project="Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj" />
178-
<BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
179-
<BuildDependency Project="Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj" />
180-
</Project>
173+
<Folder Name="/src/Microsoft.Data.SqlClient/tests/" />
174+
<Folder Name="/src/Microsoft.SqlServer.Server/">
181175
<Project Path="Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj" />
182176
</Folder>
183-
<Folder Name="/src/netcore/">
184-
<Project Path="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
185-
</Folder>
186-
<Folder Name="/src/netcore/ref/">
187-
<Project Path="Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj" />
188-
</Folder>
189-
<Folder Name="/src/netfx/">
190-
<Project Path="Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj" />
191-
</Folder>
192-
<Folder Name="/src/netfx/ref/">
193-
<Project Path="Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj" />
194-
</Folder>
195177
<Folder Name="/test/">
196178
<Project Path="Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj">
197179
<Platform Solution="*|x64" Project="x64" />
198180
<Platform Solution="*|x86" Project="x86" />
199181
</Project>
200182
<Project Path="Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj">
201-
<BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
202183
<Platform Solution="*|x64" Project="x64" />
203184
<Platform Solution="*|x86" Project="x86" />
204185
</Project>
205186
<Project Path="Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.FunctionalTests.csproj">
206187
<Platform Solution="*|x64" Project="x64" />
207188
<Platform Solution="*|x86" Project="x86" />
208189
</Project>
209-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj">
210-
<BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
211-
</Project>
190+
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj" />
212191
<Project Path="Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj">
213192
<Platform Solution="*|x64" Project="x64" />
214193
<Platform Solution="*|x86" Project="x86" />
@@ -231,19 +210,9 @@
231210
<Project Path="Microsoft.Data.SqlClient/tests/StressTests/SqlClient.Stress.Tests/SqlClient.Stress.Tests.csproj" />
232211
</Folder>
233212
<Folder Name="/test/TestClr/">
234-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj">
235-
<BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
236-
<BuildDependency Project="Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj" />
237-
</Project>
238-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj">
239-
<BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
240-
</Project>
241-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj">
242-
<BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
243-
</Project>
244-
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj">
245-
<BuildDependency Project="Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj" />
246-
</Project>
213+
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj" />
214+
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj" />
215+
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
216+
<Project Path="Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
247217
</Folder>
248-
<Project Path="../doc/apps/AzureAuthentication/AzureAuthentication.csproj" />
249218
</Solution>

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

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

0 commit comments

Comments
 (0)