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.

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

NET6 and IServiceProviderIsService support. #91

Merged
merged 19 commits into from
Jul 15, 2021
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
It is a path issue; print the path so we know what to remove
  • Loading branch information
alistairjevans committed Jul 10, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit e5f7e0259722ae4617507b62ac18baaac4e78a86
10 changes: 4 additions & 6 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -19,17 +19,15 @@ try {
Remove-Item $artifactsPath -Force -Recurse
}

# Install additional dotnet CLIs first in case installing a released Version
# over a preview overwrites the preview somehow.
# Install dotnet CLI
Write-Message "Installing .NET SDK version $sdkVersion"
Install-DotNetCli -Version $sdkVersion

foreach ($additional in $globalJson.additionalSdks)
{
Install-DotNetCli -Version $additional;
}

# Install dotnet CLI
Write-Message "Installing .NET SDK version $sdkVersion"
Install-DotNetCli -Version $sdkVersion

# Write out dotnet information
& dotnet --info

3 changes: 3 additions & 0 deletions build/Autofac.Build.psm1
Original file line number Diff line number Diff line change
@@ -77,6 +77,9 @@ function Install-DotNetCli {
}

Add-Path "$installDir"

"New Path: "
$env:PATH
}

<#
Original file line number Diff line number Diff line change
@@ -55,13 +55,20 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net6.0' ">
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<!-- New interfaces implemented in 6.0.0 for net6.0 -->
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.5.21301.5" />

<!-- Conditional references of the MEDI abstractions depending on runtime target. -->
<PackageReference Condition=" '$(TargetFramework)' == 'netstandard2.0' "
Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />

<PackageReference Condition=" '$(TargetFramework)' == 'netstandard2.1' "
Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" />

<PackageReference Condition=" '$(TargetFramework)' == 'net5.0' "
Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />

<PackageReference Condition=" '$(TargetFramework)' == 'net6.0' "
Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0-preview.5.21301.5" />

</ItemGroup>

<ItemGroup>