Skip to content

Commit

Permalink
Remove Conversion.Core registrations (dotnet#10817)
Browse files Browse the repository at this point in the history
* Remove Conversion.Core registrations

* Delete src/Deprecated/Conversion/Microsoft.Build.Conversion.Core.pkgdef

Delete pkgdef
  • Loading branch information
JanKrivanek authored Oct 17, 2024
1 parent fecff37 commit b8f46eb
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 22 deletions.

This file was deleted.

1 change: 0 additions & 1 deletion src/Package/DevDivPackage/DevDivPackage.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<ItemGroup>
<ProjectReference Include="..\..\MSBuild\MSBuild.csproj" />
<ProjectReference Include="..\..\Framework\Microsoft.Build.Framework.csproj" />
<ProjectReference Include="..\..\Deprecated\Conversion\Microsoft.Build.Conversion.csproj" />
<ProjectReference Include="..\..\Deprecated\Engine\Microsoft.Build.Engine.csproj" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion src/Package/DevDivPackage/VS.ExternalAPIs.MSBuild.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

<!-- Obsolete but still referenced in the VS repo -->
<file src="Microsoft.Build.Engine.dll" target="lib\net472" />
<file src="Microsoft.Build.Conversion.Core.dll" target="lib\net472" />

<file src="Microsoft.Build.tlb" target="lib\net472" />
<file src="Microsoft.Build.Framework.tlb" target="lib\net472" />
Expand Down
6 changes: 0 additions & 6 deletions src/Package/GetBinPaths.targets
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@
ReferenceOutputAssembly="false"
OutputItemType="MSBuildTaskHostResolvedProjectReferencePath" />

<ProjectReference Include="$(MSBuildThisFileDirectory)\..\Deprecated\Conversion\Microsoft.Build.Conversion.csproj"
Private="false"
ReferenceOutputAssembly="false"
OutputItemType="MSBuildConversionResolvedProjectReferencePath" />

<!-- Set up items to build projects where the Platform is set to x64, when we need the x64 versions of the files.
We have to treat these separately from normal project references, as the AssignProjectConfiguration task would overwrite
the SetPlatform item metadata if they were ProjectReferences.
Expand Down Expand Up @@ -54,7 +49,6 @@
<FrameworkBinPath>@(FrameworkResolvedProjectReferencePath->'%(RootDir)%(Directory)')</FrameworkBinPath>
<MSBuildTaskHostBinPath>@(MSBuildTaskHostResolvedProjectReferencePath->'%(RootDir)%(Directory)')</MSBuildTaskHostBinPath>
<MSBuildTaskHostX64BinPath>@(MSBuildTaskHostX64ResolvedProjectReferencePath->'%(RootDir)%(Directory)')</MSBuildTaskHostX64BinPath>
<MSBuildConversionBinPath>@(MSBuildConversionResolvedProjectReferencePath->'%(RootDir)%(Directory)')</MSBuildConversionBinPath>
</PropertyGroup>
</Target>

Expand Down
1 change: 0 additions & 1 deletion src/Package/MSBuild.VSSetup/MSBuild.VSSetup.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<SwrProperty Include="FrameworkBinPath=$(FrameworkBinPath)" />
<SwrProperty Include="TaskHostBinPath=$(MSBuildTaskHostBinPath)" />
<SwrProperty Include="TaskHostX64BinPath=$(MSBuildTaskHostX64BinPath)" />
<SwrProperty Include="MSBuildConversionBinPath=$(MSBuildConversionBinPath)" />
</ItemGroup>
</Target>

Expand Down
1 change: 0 additions & 1 deletion src/Package/MSBuild.VSSetup/MSBuild.clientenabledpkg
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ Microsoft.Build.pkgdef
Microsoft.Build.Tasks.Core.pkgdef
System.Resources.Extensions.pkgdef
Microsoft.Build.Utilities.Core.pkgdef
Microsoft.Build.Conversion.Core.pkgdef
Microsoft.Build.Engine.pkgdef
5 changes: 0 additions & 5 deletions src/Package/MSBuild.VSSetup/files.swr
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ folder InstallDir:\MSBuild\Current
file source=$(ThirdPartyNotice)

folder InstallDir:\MSBuild\Current\Bin
file source=$(MSBuildConversionBinPath)Microsoft.Build.Conversion.Core.dll vs.file.ngenApplications="[installDir]\Common7\IDE\vsn.exe" vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all
file source=$(X86BinPath)Microsoft.Build.dll vs.file.ngenApplications="[installDir]\Common7\IDE\vsn.exe" vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1
file source=$(MSBuildConversionBinPath)Microsoft.Build.Engine.dll vs.file.ngenApplications="[installDir]\Common7\IDE\vsn.exe" vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all
file source=$(X86BinPath)Microsoft.Build.Framework.dll vs.file.ngenApplications="[installDir]\Common7\IDE\vsn.exe" vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all
file source=$(X86BinPath)Microsoft.Build.Framework.tlb
file source=$(X86BinPath)Microsoft.Build.Tasks.Core.dll vs.file.ngenApplications="[installDir]\Common7\IDE\vsn.exe" vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1
Expand Down Expand Up @@ -184,9 +182,7 @@ folder InstallDir:\MSBuild\Current\Bin\amd64
file source=$(X64BinPath)MSBuild.exe.config
file source=$(TaskHostX64BinPath)MSBuildTaskHost.exe.config

file source=$(MSBuildConversionBinPath)Microsoft.Build.Conversion.Core.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)Microsoft.Build.dll vs.file.ngenArchitecture=all
file source=$(MSBuildConversionBinPath)Microsoft.Build.Engine.dll vs.file.ngenArchitecture=all
file source=$(X86BinPath)Microsoft.Build.Framework.dll vs.file.ngenArchitecture=all
file source=$(FrameworkBinPath)x64\Microsoft.Build.Framework.tlb
file source=$(X86BinPath)Microsoft.Build.Tasks.Core.dll vs.file.ngenArchitecture=all
Expand Down Expand Up @@ -335,5 +331,4 @@ folder InstallDir:\Common7\IDE\CommonExtensions\MSBuild
file source=$(SourceDir)Tasks\Microsoft.Build.Tasks.Core.pkgdef
file source=$(SourceDir)Tasks\System.Resources.Extensions.pkgdef
file source=$(SourceDir)Utilities\Microsoft.Build.Utilities.Core.pkgdef
file source=$(SourceDir)Deprecated\Conversion\Microsoft.Build.Conversion.Core.pkgdef
file source=$(SourceDir)Deprecated\Engine\Microsoft.Build.Engine.pkgdef

0 comments on commit b8f46eb

Please sign in to comment.