Skip to content

Commit b8f46eb

Browse files
authored
Remove Conversion.Core registrations (#10817)
* Remove Conversion.Core registrations * Delete src/Deprecated/Conversion/Microsoft.Build.Conversion.Core.pkgdef Delete pkgdef
1 parent fecff37 commit b8f46eb

File tree

7 files changed

+0
-22
lines changed

7 files changed

+0
-22
lines changed

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

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

src/Package/DevDivPackage/DevDivPackage.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<ItemGroup>
1515
<ProjectReference Include="..\..\MSBuild\MSBuild.csproj" />
1616
<ProjectReference Include="..\..\Framework\Microsoft.Build.Framework.csproj" />
17-
<ProjectReference Include="..\..\Deprecated\Conversion\Microsoft.Build.Conversion.csproj" />
1817
<ProjectReference Include="..\..\Deprecated\Engine\Microsoft.Build.Engine.csproj" />
1918
</ItemGroup>
2019

src/Package/DevDivPackage/VS.ExternalAPIs.MSBuild.nuspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

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

2726
<file src="Microsoft.Build.tlb" target="lib\net472" />
2827
<file src="Microsoft.Build.Framework.tlb" target="lib\net472" />

src/Package/GetBinPaths.targets

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
ReferenceOutputAssembly="false"
2020
OutputItemType="MSBuildTaskHostResolvedProjectReferencePath" />
2121

22-
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\Deprecated\Conversion\Microsoft.Build.Conversion.csproj"
23-
Private="false"
24-
ReferenceOutputAssembly="false"
25-
OutputItemType="MSBuildConversionResolvedProjectReferencePath" />
26-
2722
<!-- Set up items to build projects where the Platform is set to x64, when we need the x64 versions of the files.
2823
We have to treat these separately from normal project references, as the AssignProjectConfiguration task would overwrite
2924
the SetPlatform item metadata if they were ProjectReferences.
@@ -54,7 +49,6 @@
5449
<FrameworkBinPath>@(FrameworkResolvedProjectReferencePath->'%(RootDir)%(Directory)')</FrameworkBinPath>
5550
<MSBuildTaskHostBinPath>@(MSBuildTaskHostResolvedProjectReferencePath->'%(RootDir)%(Directory)')</MSBuildTaskHostBinPath>
5651
<MSBuildTaskHostX64BinPath>@(MSBuildTaskHostX64ResolvedProjectReferencePath->'%(RootDir)%(Directory)')</MSBuildTaskHostX64BinPath>
57-
<MSBuildConversionBinPath>@(MSBuildConversionResolvedProjectReferencePath->'%(RootDir)%(Directory)')</MSBuildConversionBinPath>
5852
</PropertyGroup>
5953
</Target>
6054

src/Package/MSBuild.VSSetup/MSBuild.VSSetup.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<SwrProperty Include="FrameworkBinPath=$(FrameworkBinPath)" />
3838
<SwrProperty Include="TaskHostBinPath=$(MSBuildTaskHostBinPath)" />
3939
<SwrProperty Include="TaskHostX64BinPath=$(MSBuildTaskHostX64BinPath)" />
40-
<SwrProperty Include="MSBuildConversionBinPath=$(MSBuildConversionBinPath)" />
4140
</ItemGroup>
4241
</Target>
4342

src/Package/MSBuild.VSSetup/MSBuild.clientenabledpkg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ Microsoft.Build.pkgdef
33
Microsoft.Build.Tasks.Core.pkgdef
44
System.Resources.Extensions.pkgdef
55
Microsoft.Build.Utilities.Core.pkgdef
6-
Microsoft.Build.Conversion.Core.pkgdef
76
Microsoft.Build.Engine.pkgdef

src/Package/MSBuild.VSSetup/files.swr

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ folder InstallDir:\MSBuild\Current
2626
file source=$(ThirdPartyNotice)
2727

2828
folder InstallDir:\MSBuild\Current\Bin
29-
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
3029
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
31-
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
3230
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
3331
file source=$(X86BinPath)Microsoft.Build.Framework.tlb
3432
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
@@ -184,9 +182,7 @@ folder InstallDir:\MSBuild\Current\Bin\amd64
184182
file source=$(X64BinPath)MSBuild.exe.config
185183
file source=$(TaskHostX64BinPath)MSBuildTaskHost.exe.config
186184

187-
file source=$(MSBuildConversionBinPath)Microsoft.Build.Conversion.Core.dll vs.file.ngenArchitecture=all
188185
file source=$(X86BinPath)Microsoft.Build.dll vs.file.ngenArchitecture=all
189-
file source=$(MSBuildConversionBinPath)Microsoft.Build.Engine.dll vs.file.ngenArchitecture=all
190186
file source=$(X86BinPath)Microsoft.Build.Framework.dll vs.file.ngenArchitecture=all
191187
file source=$(FrameworkBinPath)x64\Microsoft.Build.Framework.tlb
192188
file source=$(X86BinPath)Microsoft.Build.Tasks.Core.dll vs.file.ngenArchitecture=all
@@ -335,5 +331,4 @@ folder InstallDir:\Common7\IDE\CommonExtensions\MSBuild
335331
file source=$(SourceDir)Tasks\Microsoft.Build.Tasks.Core.pkgdef
336332
file source=$(SourceDir)Tasks\System.Resources.Extensions.pkgdef
337333
file source=$(SourceDir)Utilities\Microsoft.Build.Utilities.Core.pkgdef
338-
file source=$(SourceDir)Deprecated\Conversion\Microsoft.Build.Conversion.Core.pkgdef
339334
file source=$(SourceDir)Deprecated\Engine\Microsoft.Build.Engine.pkgdef

0 commit comments

Comments
 (0)