Skip to content

Add Customizations.props and change extension point #1188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Add Customizations.props and change extension point #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f60176
Import Customizations.props after the project file
ViktorHofer Mar 3, 2025
b1a91a3
Add Customizations.props files for 4 projects
ViktorHofer Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions src/referencePackages/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,6 @@

<Import Project="..\..\Directory.Build.props" />

<PropertyGroup>
<CustomizationsPropsPath>$(MSBuildProjectDirectory)\$(CustomizationsPropsFile)</CustomizationsPropsPath>
<CustomizationsSourcePath>$(MSBuildProjectDirectory)\$(CustomizationsSourceFile)</CustomizationsSourcePath>
</PropertyGroup>

<!-- Customization extension point -->
<Import Project="$(CustomizationsPropsPath)" Condition="Exists('$(CustomizationsPropsPath)')" />

<ItemGroup>
<!-- Attributes for all Reference Packages -->
<Compile Include="$(RepoRoot)src\SourceBuildAssemblyMetdata.cs" />

<!-- Customization extension point -->
<Compile Include="$(CustomizationsSourcePath)" Condition="Exists('$(CustomizationsSourcePath)')" />
</ItemGroup>

<PropertyGroup>
<!-- Common properties for all Reference Packages -->
<DebugType>None</DebugType>
Expand Down
14 changes: 14 additions & 0 deletions src/referencePackages/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,25 @@

<Import Project="..\..\Directory.Build.targets" />

<PropertyGroup>
<CustomizationsPropsPath>$(MSBuildProjectDirectory)\$(CustomizationsPropsFile)</CustomizationsPropsPath>
<CustomizationsSourcePath>$(MSBuildProjectDirectory)\$(CustomizationsSourceFile)</CustomizationsSourcePath>
</PropertyGroup>

<ItemGroup>
<Compile Include="ref/$(TargetFramework)/*$(DefaultLanguageSourceExtension)" />
<Compile Include="lib/$(TargetFramework)/*$(DefaultLanguageSourceExtension)" />

<!-- Attributes for all Reference Packages -->
<Compile Include="$(RepoRoot)src\SourceBuildAssemblyMetdata.cs" />

<!-- Customization extension point -->
<Compile Include="$(CustomizationsSourcePath)" Condition="Exists('$(CustomizationsSourcePath)')" />
</ItemGroup>

<!-- Customization extension point -->
<Import Project="$(CustomizationsPropsPath)" Condition="Exists('$(CustomizationsPropsPath)')" />

<!--
### Targeting Packs section ###
Keep in sync with available targeting packs under src/targetPacks/ILsrc.
Expand Down
8 changes: 8 additions & 0 deletions src/referencePackages/src/microsoft.build.tasks.core/17.8.3/Customizations.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>

<ItemGroup>
<!-- Microsoft.VisualStudio.Setup.Configuration.Interop was accidentally exposed by the product. -->
<PackageReference Remove="Microsoft.VisualStudio.Setup.Configuration.Interop" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions ...cePackages/src/microsoft.build.tasks.core/17.8.3/Microsoft.Build.Tasks.Core.17.8.3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.2" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />
<!-- Microsoft.VisualStudio.Setup.Configuration.Interop was accidentally exposed by the product.
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.2.2146" /> -->
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.2.2146" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
</ItemGroup>

Expand Down
8 changes: 8 additions & 0 deletions src/referencePackages/src/microsoft.build.utilities.core/17.8.3/Customizations.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>

<ItemGroup>
<!-- Microsoft.VisualStudio.Setup.Configuration.Interop was accidentally exposed by the product. -->
<PackageReference Remove="Microsoft.VisualStudio.Setup.Configuration.Interop" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions ...es/src/microsoft.build.utilities.core/17.8.3/Microsoft.Build.Utilities.Core.17.8.3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Build.Framework" Version="17.8.3" />
<PackageReference Include="Microsoft.NET.StringTools" Version="17.8.3" />
<!-- Microsoft.VisualStudio.Setup.Configuration.Interop was accidentally exposed by the product.
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.2.2146" /> -->
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.2.2146" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
</ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions src/referencePackages/src/microsoft.codeanalysis.common/4.1.0/Customizations.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>

<ItemGroup>
<!-- Analyzers are excluded from SBRPs -->
<PackageReference Remove="Microsoft.CodeAnalysis.Analyzers" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions ...ckages/src/microsoft.codeanalysis.common/4.1.0/Microsoft.CodeAnalysis.Common.4.1.0.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<!-- Analyzers are excluded from SBRPs
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" /> -->
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
Expand Down
8 changes: 8 additions & 0 deletions ...eferencePackages/src/system.configuration.configurationmanager/8.0.0/Customizations.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<!-- Necessary for PermissionSet types but as a dangling compile-time only reference. -->
<ProjectReference Include="../../system.security.permissions/7.0.0/System.Security.Permissions.7.0.0.csproj" PrivateAssets="all" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this defined as a project reference vs a package reference?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, that's coming from my other PR and was a copy paste error.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I figured so, no action needed unless that work for whatever reason isn't completed.

</ItemGroup>

</Project>
2 changes: 0 additions & 2 deletions ...uration.configurationmanager/8.0.0/System.Configuration.ConfigurationManager.8.0.0.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<!-- Necessary for PermissionSet types but as a dangling compile-time only reference. -->
<PackageReference Include="System.Security.Permissions" Version="7.0.0" PrivateAssets="all" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
</ItemGroup>

Expand Down