Skip to content
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

Jump to bottom

Return Conversion.Core registrations (#10817) #10851

Merged
merged 1 commit into from
Oct 21, 2024
+0 −22
Merged

Return Conversion.Core registrations (#10817) #10851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions src/Deprecated/Conversion/Microsoft.Build.Conversion.Core.pkgdef
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Package/DevDivPackage/DevDivPackage.csproj
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 @@ -185,9 +183,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 @@ -336,5 +332,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
Loading