Skip to content

Drop major version prop files #11591

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 5 commits into from
Apr 16, 2025
Merged

Drop major version prop files #11591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df99cad
deleted file import
maridematte Mar 13, 2025
02c6a53
deleted unused props files
maridematte Mar 13, 2025
0fb4fbb
bring back import, just unconditional
maridematte Mar 13, 2025
0da4900
removed props files references from more files
maridematte Mar 17, 2025
62dc27a
another props removal
maridematte Mar 17, 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
3 changes: 0 additions & 3 deletions src/MSBuild/MSBuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,6 @@
<_OurFiles Include="$(OutputPath)%(_TargetFrameworks.Identity)\Microsoft.VisualBasic.CrossTargeting.targets" TargetFramework="%(_TargetFrameworks.Identity)" />
<_OurFiles Include="$(OutputPath)%(_TargetFrameworks.Identity)\Microsoft.VisualBasic.CurrentVersion.targets" TargetFramework="%(_TargetFrameworks.Identity)" />
<_OurFiles Include="$(OutputPath)%(_TargetFrameworks.Identity)\Microsoft.VisualBasic.targets" TargetFramework="%(_TargetFrameworks.Identity)" />
<_OurFiles Include="$(OutputPath)%(_TargetFrameworks.Identity)\Microsoft.VisualStudioVersion.v11.Common.props" TargetFramework="%(_TargetFrameworks.Identity)" />
<_OurFiles Include="$(OutputPath)%(_TargetFrameworks.Identity)\Microsoft.VisualStudioVersion.v12.Common.props" TargetFramework="%(_TargetFrameworks.Identity)" />
<_OurFiles Include="$(OutputPath)%(_TargetFrameworks.Identity)\Microsoft.VisualStudioVersion.v14.Common.props" TargetFramework="%(_TargetFrameworks.Identity)" />
<_OurFiles Include="$(OutputPath)%(_TargetFrameworks.Identity)\ref\**" TargetFramework="%(_TargetFrameworks.Identity)" Subdirectory="ref\" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion src/Package/MSBuild.VSSetup/files.swr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ vs.relatedProcessFiles

folder InstallDir:\MSBuild\Current
file source=$(X86BinPath)Microsoft.Common.props
file source=$(X86BinPath)Microsoft.VisualStudioVersion.v17.Common.props
file source=$(ThirdPartyNotice)

folder InstallDir:\MSBuild\Current\Bin
Expand Down
18 changes: 0 additions & 18 deletions src/Tasks/Microsoft.Build.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,24 +447,6 @@
<Content Include="Microsoft.NETFramework.props">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Microsoft.VisualStudioVersion.v11.Common.props">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Microsoft.VisualStudioVersion.v12.Common.props">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Microsoft.VisualStudioVersion.v14.Common.props">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Microsoft.VisualStudioVersion.v15.Common.props">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Microsoft.VisualStudioVersion.v16.Common.props">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Microsoft.VisualStudioVersion.v17.Common.props">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<!-- Resource Files -->
<EmbeddedResource Include="Resources\Strings.resx">
<LogicalName>$(AssemblyName).Strings.resources</LogicalName>
Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<WMSJSProjectDirectory Condition="'$(WMSJSProjectDirectory)' == ''">JavaScript</WMSJSProjectDirectory>
</PropertyGroup>

<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.VisualStudioVersion.v*.Common.props" Condition="'$(VisualStudioVersion)' == ''" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.VisualStudioVersion.v*.Common.props" />

<Import Project="$(CustomAfterMicrosoftCommonProps)" Condition="'$(CustomAfterMicrosoftCommonProps)' != '' and Exists('$(CustomAfterMicrosoftCommonProps)')" />

Expand Down
19 changes: 0 additions & 19 deletions src/Tasks/Microsoft.VisualStudioVersion.v11.Common.props
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/Tasks/Microsoft.VisualStudioVersion.v12.Common.props
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/Tasks/Microsoft.VisualStudioVersion.v14.Common.props
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/Tasks/Microsoft.VisualStudioVersion.v15.Common.props
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/Tasks/Microsoft.VisualStudioVersion.v16.Common.props
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/Tasks/Microsoft.VisualStudioVersion.v17.Common.props
View file
Open in desktop

This file was deleted.