Skip to content

[release/6.0] Ensure UserSecretsIdAttribute is added to assembly #63423

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

Merged
merged 2 commits into from
Jan 7, 2022
Merged

[release/6.0] Ensure UserSecretsIdAttribute is added to assembly #63423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
635395f
[release/6.0] Ensure UserSecretsIdAttribute is added to assembly
eerhardt Jan 6, 2022
0ce839e
Add a binding redirect in order to fix test failure on netfx.
eerhardt Jan 6, 2022
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
6 changes: 4 additions & 2 deletions ...sions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
<PackageDescription>User secrets configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ServicingVersion>1</ServicingVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -14,8 +16,8 @@
</ItemGroup>

<ItemGroup>
<Content Include="build\netstandard2.0\$(MSBuildProjectName).props" PackagePath="%(Identity)" />
<Content Include="build\netstandard2.0\$(MSBuildProjectName).targets" PackagePath="%(Identity)" />
<Content Include="buildTransitive\netstandard2.0\$(MSBuildProjectName).props" PackagePath="%(Identity)" />
<Content Include="buildTransitive\netstandard2.0\$(MSBuildProjectName).targets" PackagePath="%(Identity)" />
</ItemGroup>

</Project>
0 ...xtensions.Configuration.UserSecrets.props → ...xtensions.Configuration.UserSecrets.props
View file
Open in desktop
File renamed without changes.
0 ...ensions.Configuration.UserSecrets.targets → ...ensions.Configuration.UserSecrets.targets
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions src/libraries/Microsoft.Extensions.Hosting/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<IncludePlatformAttributes>true</IncludePlatformAttributes>
<ServicingVersion>1</ServicingVersion>
</PropertyGroup>
</Project>
4 changes: 3 additions & 1 deletion src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;netstandard2.1;net461</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
<PackageDescription>Hosting and startup infrastructures for applications.</PackageDescription>
<!-- Use targeting pack references instead of granular ones in the project file. -->
<DisableImplicitAssemblyReferences>false</DisableImplicitAssemblyReferences>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<!-- ServicingVersion moved to ..\Directory.Build.props in order to share with test project. -->
</PropertyGroup>

<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
Expand Down
6 changes: 6 additions & 0 deletions ...crosoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,10 @@
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Hosting\src\Microsoft.Extensions.Hosting.csproj" />
</ItemGroup>

<ItemGroup>
<!-- Workaround for https://github.com/dotnet/runtime/issues/63467 -->
<SuggestedBindingRedirects Include="Microsoft.Extensions.Hosting, Culture=neutral, PublicKeyToken=adb9793829ddae60"
MaxVersion="$(MajorVersion).$(MinorVersion).0.$(ServicingVersion)" />
</ItemGroup>

</Project>