mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #14098 from dotnet/marcpopMSFT-addreleases

Browse source 
Add the releases dll to the msbuild sdk resolvers folder.
This commit is contained in:
Marc Paine 2022-07-08 16:05:04 -07:00 • committed by GitHub
commit f8fb662f9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
eng/Versions.props
View file

@ -208,5 +208,9 @@
<!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</CLI_NETStandardLibraryNETFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->
<DotNetDeploymentReleasesPackageVersion>1.0.0-preview5.1.22263.1</DotNetDeploymentReleasesPackageVersion>
</PropertyGroup>
<Import Project="$(RepositoryEngineeringDir)ManualVersions.props" />
</Project>

9
src/redist/targets/GenerateMSBuildExtensions.targets
View file

@ -7,11 +7,15 @@
<NETStandardLibraryNETFrameworkPackageName>NETStandard.Library.NETFramework</NETStandardLibraryNETFrameworkPackageName>
<NETStandardLibraryNETFrameworkNuPkgPath>$(NuGetPackageRoot)$(NETStandardLibraryNETFrameworkPackageName.ToLower())/$(CLI_NETStandardLibraryNETFrameworkVersion.ToLower())</NETStandardLibraryNETFrameworkNuPkgPath>
<DotNetDeploymentReleasesPackageName>Microsoft.Deployment.DotNet.Releases</DotNetDeploymentReleasesPackageName>
<DotNetDeploymentReleasesPkgPath>$(NuGetPackageRoot)$(DotNetDeploymentReleasesPackageName.ToLower())/$(DotNetDeploymentReleasesPackageVersion.ToLower())</DotNetDeploymentReleasesPkgPath>
</PropertyGroup>
<ItemGroup>
<ExtensionPackageToRestore Include="$(MSBuildExtensionsPackageName)" Version="$(MicrosoftNETBuildExtensionsPackageVersion)"/>
<ExtensionPackageToRestore Include="$(NETStandardLibraryNETFrameworkPackageName)" Version="$(CLI_NETStandardLibraryNETFrameworkVersion)"/>
<ExtensionPackageToRestore Include="$(DotNetDeploymentReleasesPackageName)" Version="$(DotNetDeploymentReleasesPackageVersion)"/>
</ItemGroup>
<!-- Restore msbuild extensions via PackageReference -->
@ -41,6 +45,9 @@
Exclude="$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.props;$(NETStandardLibraryNETFrameworkNuPkgPath)\build\**\*.targets"
DeploymentSubpath="msbuildExtensions/Microsoft/Microsoft.NET.Build.Extensions/" />
<VSMSBuildExtensionsContent Include="$(DotNetDeploymentReleasesPkgPath)\lib\net452\**\*.*"
DeploymentSubpath="MSBuildSdkResolver/" />
<VSMSBuildExtensionsContent Include="$(SdkResolverLayoutPath)/**/*"
DeploymentSubpath="MSBuildSdkResolver/" />
@ -51,4 +58,4 @@
<Copy SourceFiles="@(VSMSBuildExtensionsContent)" DestinationFiles="%(VSMSBuildExtensionsContent.DestinationPath)" />
</Target>
</Project>
</Project>