Merge Project | Build the Common Project #3837
+161
−38
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <!-- Build Parameters ============================================== --> | ||
| <PropertyGroup> | ||
| <!-- Configuration: Which build configuration to build --> | ||
| <!-- Allowed values: Debug, Release --> | ||
| <!-- Default value: Debug --> | ||
| <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> | ||
|
|
||
| <!-- DotnetPath: Path to folder containing the `dotnet` binary. Override this if a --> | ||
| <!-- specific version (eg, x86) is required. Otherwise, this defaults to using the --> | ||
| <!-- dotnet binary in the PATH variable. The provided path should end with a `\` (or --> | ||
| <!-- `/`) character. Eg. C:\x86\ --> | ||
| <DotnetPath Condition="'$(DotnetPath)' == ''"></DotnetPath> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Imports ======================================================= --> | ||
| <Import Project="src/Directory.Build.props" /> | ||
|
|
||
| <!-- Microsoft.Data.SqlClient Build Targets ======================== --> | ||
| <PropertyGroup> | ||
| <MdsProjectPath>$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj</MdsProjectPath> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- BuildMds: Builds all binaries for MDS --> | ||
| <Target Name="BuildMds" DependsOnTargets="BuildMdsUnix;BuildMdsWindows" /> | ||
|
|
||
| <!-- BuildMdsUnix: Builds all unix-specific MDS binaries --> | ||
| <Target Name="BuildMdsUnix"> | ||
| <PropertyGroup> | ||
| <DotnetCommand> | ||
| $(DotnetPath)dotnet build $(MdsProjectPath) | ||
| -p:Configuration=$(Configuration) | ||
| -p:TargetOs=Unix | ||
| </DotnetCommand> | ||
| <!-- Convert more than one whitespace character into one space --> | ||
| <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand> | ||
| </PropertyGroup> | ||
| <Message Text=">>> Building MDS for Unix via command: $(DotnetCommand)"/> | ||
| <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" /> | ||
| </Target> | ||
|
|
||
| <!-- BuildMdsWindows: Builds all windows-specific MDS binaries --> | ||
| <Target Name="BuildMdsWindows"> | ||
|
Member
There was a problem hiding this comment. Don't forget strong name key signing is a MUST.
Contributor
Author
There was a problem hiding this comment. Ah, good catch. I will get that in on this PR. Otherwise, I'll definitely forget.
Member
There was a problem hiding this comment. Is this planned for later? |
||
| <PropertyGroup> | ||
| <DotnetCommand> | ||
| $(DotnetPath)dotnet build $(MdsProjectPath) | ||
| -p:Configuration=$(Configuration) | ||
| -p:TargetOs=Windows_NT | ||
| </DotnetCommand> | ||
| <!-- Convert more than one whitespace character into one space --> | ||
| <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand> | ||
|
Member
There was a problem hiding this comment. What's this about? Why so much complexity? |
||
| </PropertyGroup> | ||
| <Message Text=">>> Building MDS for Windows via command: $(DotnetCommand)"/> | ||
| <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" /> | ||
| </Target> | ||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,108 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <!-- General Properties ============================================== --> | ||
| <PropertyGroup> | ||
| <Configurations>Debug;Release;</Configurations> | ||
benrr101 marked this conversation as resolved.
Show resolved
Hide resolved
benrr101 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <RootNamespace /> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Strong name signing ============================================= --> | ||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(CDP_BUILD_TYPE)' == 'Official'"> | ||
| <SignAssembly>true</SignAssembly> | ||
| <KeyFile>$(SigningKeyPath)</KeyFile> | ||
| </PropertyGroup> | ||
|
|
||
|
|
||
| <!-- OS Constants ==================================================== --> | ||
| <PropertyGroup> | ||
| <!-- @TODO: Move to directory.build.props? --> | ||
| <!-- If a target OS was not specified, use the current OS as the target OS. --> | ||
| <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs> | ||
paulmedynski marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| <!-- Uncomment the following line to override the OS you are developing for --> | ||
| <!--<TargetOs>Unix</TargetOs>--> | ||
| <!--<TargetOs>Windows_NT</TargetOs>--> | ||
|
|
||
| <NormalizedTargetOs>$(TargetOs.ToLower())</NormalizedTargetOs> | ||
|
|
||
| <!-- NOTE: These constants are prefixed with _ to keep them separate from .NET 5+ precompiler --> | ||
| <!-- flags. Those only apply to OS-specific target frameworks, and would interfere here. --> | ||
| <DefineConstants Condition="'$(NormalizedTargetOs)' == 'unix'">$(DefineConstants);_UNIX</DefineConstants> | ||
| <DefineConstants Condition="'$(NormalizedTargetOs)' == 'windows_nt'">$(DefineConstants);_WINDOWS</DefineConstants> | ||
benrr101 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </PropertyGroup> | ||
|
|
||
| <!-- Target Frameworks =============================================== --> | ||
| <PropertyGroup> | ||
| <!-- net462 is only supported on Windows, so we will only add it if we're building for Windows --> | ||
| <TargetFrameworks>net8.0;net9.0</TargetFrameworks> | ||
| <TargetFrameworks Condition="'$(NormalizedTargetOs)' == 'windows_nt'">$(TargetFrameworks);net462</TargetFrameworks> | ||
benrr101 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </PropertyGroup> | ||
|
|
||
| <!-- Build Output ==================================================== --> | ||
| <PropertyGroup> | ||
| <!-- @TODO: Move to directory.build.props? --> | ||
| <ArtifactPath>$(RepoRoot)artifacts/</ArtifactPath> | ||
|
|
||
| <!-- MSBuild will add the target framework to the end of this path by default. Telling it not --> | ||
| <!-- to is possible but requires also specifying the IntermediateOutputPath. So while it --> | ||
| <!-- would be nice to have a flat directory structure, it's more hassle than its worth. --> | ||
| <OutputPath>$(ArtifactPath)$(AssemblyName)/$(Configuration)/$(NormalizedTargetOs)/</OutputPath> | ||
benrr101 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </PropertyGroup> | ||
|
|
||
| <!-- Embedded resources ============================================== --> | ||
| <ItemGroup> | ||
| <!-- Linker directives to replace UseManagedNetworking with a constant if consumer specifies --> | ||
| <!-- the app context switch in their csproj. This file only applies to netcore on windows. --> | ||
| <!-- This file does not support pre-processor directives, so it must be conditionally --> | ||
| <!-- included into the build. --> | ||
| <EmbeddedResource Include="Resources/ILLink.Substitutions.xml" | ||
| Condition="'$(NormalizedTargetOs)' == 'windows_nt' AND '$(TargetFramework)' != 'net462'" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- References ====================================================== --> | ||
| <!-- References for netframework --> | ||
| <ItemGroup Condition="'$(TargetFramework)' == 'net462'"> | ||
| <Reference Include="System.Configuration" /> | ||
| <Reference Include="System.EnterpriseServices" /> | ||
| <Reference Include="System.Transactions" /> | ||
|
|
||
| <PackageReference Include="Azure.Core" /> | ||
| <PackageReference Include="Azure.Identity" /> | ||
| <PackageReference Include="Microsoft.Bcl.Cryptography" /> | ||
| <PackageReference Include="Microsoft.Data.SqlClient.SNI"> | ||
| <PrivateAssets>All</PrivateAssets> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.Extensions.Caching.Memory" /> | ||
| <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" /> | ||
| <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" /> | ||
| <PackageReference Include="System.Buffers" /> | ||
| <PackageReference Include="System.Diagnostics.DiagnosticSource" /> | ||
| <PackageReference Include="System.Memory" /> | ||
| <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" /> | ||
| <PackageReference Include="System.Security.Cryptography.Pkcs" /> | ||
benrr101 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <PackageReference Include="System.Text.Json" /> | ||
| <PackageReference Include="System.Threading.Channels" /> | ||
| <PackageReference Include="System.ValueTuple" /> | ||
| </ItemGroup> | ||
benrr101 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| <!-- References for netcore --> | ||
| <ItemGroup Condition="'$(TargetFramework)' != 'net462'"> | ||
| <PackageReference Include="Azure.Core" /> | ||
| <PackageReference Include="Azure.Identity" /> | ||
|
Member
There was a problem hiding this comment. Why not combine shared dependencies that must be included regardless of target framework? |
||
| <PackageReference Include="Microsoft.Bcl.Cryptography" /> | ||
|
Member
There was a problem hiding this comment. Please also include dependency on Microsoft.Identity.client (MSAL). It should be present in all projects, I don't recall why it got removed. But, we use its APIs directly in AAD implementation and cannot connect with AAD Auth modes when debugging locally unless its included. |
||
| <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" /> | ||
| <PackageReference Include="Microsoft.Extensions.Caching.Memory" /> | ||
| <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" /> | ||
| <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" /> | ||
| <PackageReference Include="Microsoft.SqlServer.Server" /> | ||
| <PackageReference Include="System.Configuration.ConfigurationManager" /> | ||
| <PackageReference Include="System.Security.Cryptography.Pkcs" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- CodeGen Targets ================================================= --> | ||
| <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" /> | ||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Build proj is outdated build system, I was honestly hoping for a better and modern build system we would use with the unified Dotnet SDK style project. Do we have options to consider?