diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2022-09-23 05:15:59 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2022-09-23 05:15:59 +0300 |
| commit | fdc9cc80ad989506ed1c1ec02174f108a779b704 (patch) | |
| tree | 5eeb7fc92619dc7664ff5097719fd51cac659628 | |
| parent | dfb823d9755186173a3bf694591ac4fd549d9a53 (diff) | |
| parent | a99fddf8bd3252eb96f4b52dd46ffcd09c63bf69 (diff) | |
Merge in 'release/7.0-rc2' changes
3 files changed, 7 insertions, 5 deletions
diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj index 38a3f2a347..2db57db253 100644 --- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj +++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <!-- Included primarily to ensure dotnet-getdocument and GetDocument.Insider can be referenced. --> - <TargetFrameworks>netcoreapp2.1;$(DefaultNetFxTargetFramework)</TargetFrameworks> + <TargetFrameworks>netcoreapp2.1;$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks> <Description>MSBuild tasks and targets for build-time Swagger and OpenApi document generation</Description> <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> @@ -19,7 +19,7 @@ because publish output matches what was built. --> <Reference Include="dotnet-getdocument" - Condition=" '$(TargetFramework)' == 'netcoreapp2.1' " + Condition=" '$(TargetFramework)' != '$(DefaultNetFxTargetFramework)' " Targets="Publish" Private="false" ReferenceOutputAssembly="false" @@ -28,7 +28,7 @@ Private="false" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true"> - <Targets Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">Publish</Targets> + <Targets Condition=" '$(TargetFramework)' != '$(DefaultNetFxTargetFramework)' ">Publish</Targets> </Reference> </ItemGroup> diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec index f9c41332cb..ae66fa3765 100644 --- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec +++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd"> <metadata minClientVersion="2.8"> $CommonMetadataElements$ @@ -12,5 +12,6 @@ <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net462\*.*" target="tools\net462" /> <file src="$artifactsBinDir$\GetDocument.Insider\x86\$configuration$\net462\*.*" target="tools\net462-x86" /> <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\netcoreapp2.1\publish\*.*" target="tools\netcoreapp2.1" /> + <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net7.0\publish\*.*" target="tools\net7.0" /> </files> </package> diff --git a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj index 3961d1bcc9..f16e884f76 100644 --- a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj +++ b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj @@ -16,7 +16,8 @@ </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'"> - <Reference Include="Microsoft.AspNetCore" /> + <Reference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" /> + <Reference Include="Microsoft.Extensions.Hosting.Abstractions" /> </ItemGroup> <ItemGroup> |