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

Move IVTs from AssemblyInfo into project files #10573

Merged
merged 18 commits into from
Jul 3, 2024
Merged

Move IVTs from AssemblyInfo into project files #10573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9b5c9fb
Add Moq public key value in Directory.Build.props
DustinCampbell Jul 2, 2024
a56ecd4
Move MS.ANC.Mcv.Razor.Extensions.Test IVTs to project file
DustinCampbell Jul 2, 2024
e6a68ae
Move MS.ANC.Mcv.Razor.Extensions.Version1_X.Test IVTs to project file
DustinCampbell Jul 2, 2024
f2b7753
Move MS.ANC.Mcv.Razor.Extensions.Version2_X.Test IVTs to project file
DustinCampbell Jul 2, 2024
50ab6ed
Move MS.ANC.Razor.Language.Test IVTs to project file
DustinCampbell Jul 2, 2024
9fb2709
Move MS.CA.Razor.Compiler IVTs to project file
DustinCampbell Jul 2, 2024
54b32fa
Move MS.ANC.Razor.Test.Common IVTs to project file
DustinCampbell Jul 2, 2024
906173a
Move MS.ANC.Razor.Utilities.Shared IVTs to project file
DustinCampbell Jul 2, 2024
0328fca
Move MS.ANC.Razor.EA.RoslynWorkspace IVTs to project file
DustinCampbell Jul 2, 2024
7c4b0ad
Move MS.ANC.Razor.LanguageServer IVTs to project file
DustinCampbell Jul 2, 2024
c2e2c4b
Move MS.ANC.Razor.ProjectEngineHost IVTs to project file
DustinCampbell Jul 2, 2024
473c578
Move MS.CA.Razor.Workspaces IVTs to project file
DustinCampbell Jul 2, 2024
47266af
Move MS.CA.Remote.Razor IVTs to project file
DustinCampbell Jul 2, 2024
7b051d7
Move MS.VS.LanguageServer.ContainedLanguage IVTs to project file
DustinCampbell Jul 2, 2024
57d5c32
Move MS.VS.LanguageServices.Razor IVTs to project file
DustinCampbell Jul 2, 2024
dffee73
Move MS.VS.LegacyEditor.Razor IVTs to project file
DustinCampbell Jul 2, 2024
228bb2e
Move MS.ANC.Razor.Test.Common IVTs to project file
DustinCampbell Jul 2, 2024
768f03b
Fix BOM
DustinCampbell Jul 3, 2024
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
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@

<!-- For InternalsVisibleTo items-->
<PropertyGroup Label="Public Keys">
<MoqPublicKey>0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</MoqPublicKey>
<RazorKey>0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb</RazorKey>
<VisualStudioKey>002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293</VisualStudioKey>
</PropertyGroup>
Expand Down
24 changes: 24 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,28 @@
</AssemblyAttribute>
</ItemGroup>
</Target>

<!-- RestrictedInternalsVisibleTo -->
<ItemDefinitionGroup>
<RestrictedInternalsVisibleTo>
<Visible>false</Visible>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this for?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It probably doesn't have much impact, but it matches the item definition for InternalsVisibleTo in arcade:

https://github.com/dotnet/arcade/blob/4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateInternalsVisibleTo.targets#L8-L12

</RestrictedInternalsVisibleTo>
</ItemDefinitionGroup>

<ItemGroup>
<InternalsVisibleTo Include="@(RestrictedInternalsVisibleTo)" Key="%(Key)" />
</ItemGroup>

<Target Name="PrepareGenerateRestrictedInternalsVisibleTo"
BeforeTargets="PrepareGenerateInternalsVisibleToFile"
Condition="'@(RestrictedInternalsVisibleTo)' != ''">
<ItemGroup>
<_InternalsVisibleToAttribute Include="System.Runtime.CompilerServices.RestrictedInternalsVisibleToAttribute">
<_Parameter1>%(RestrictedInternalsVisibleTo.Identity)</_Parameter1>
<_Parameter2 Condition="'%(RestrictedInternalsVisibleTo.Namespace)' != ''">%(RestrictedInternalsVisibleTo.Namespace)</_Parameter2>
</_InternalsVisibleToAttribute>
</ItemGroup>

<Warning Condition="'%(RestrictedInternalsVisibleTo.Partner)' == '' and '%(RestrictedInternalsVisibleTo.Namespace)' == ''" Text="RestrictedInternalsVisibleTo items must specify the 'Partner' or 'Namespace' attribute. Target assembly: %(Identity)" />
</Target>
</Project>
4 changes: 4 additions & 0 deletions ...tensions.Version1_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<PackageReference Include="Moq" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" />
</ItemGroup>

<ItemGroup>
<MvcShim Condition="$(TargetFramework) != ''" Include="$(ArtifactsBinDir)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.Compiler\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.Compiler.deps.json" />
</ItemGroup>
Expand Down
8 changes: 0 additions & 8 deletions ...iler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions ...tensions.Version2_X/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<PackageReference Include="Moq" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" />
</ItemGroup>

<Target Name="CopyDepsFromShims_Build" AfterTargets="Build">
<ItemGroup>
<MvcShim Condition="$(TargetFramework) != ''" Include="$(ArtifactsBinDir)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.Compiler\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.Version2_X.Compiler.deps.json" />
Expand Down
8 changes: 0 additions & 8 deletions ...iler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions ...spNetCore.Mvc.Razor.Extensions/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<PackageReference Include="Moq" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" />
</ItemGroup>

<Target Name="CopyDepsFromShims_Build" AfterTargets="Build">
<ItemGroup>
<MvcShim Condition="$(TargetFramework) != ''" Include="$(ArtifactsBinDir)\Microsoft.AspNetCore.Razor.Test.MvcShim.Compiler\$(Configuration)\$(TargetFramework)\Microsoft.AspNetCore.Razor.Test.MvcShim.Compiler.deps.json" />
Expand Down
8 changes: 0 additions & 8 deletions src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions .../Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,8 @@
<None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" />
</ItemGroup>

</Project>
8 changes: 0 additions & 8 deletions src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

34 changes: 34 additions & 0 deletions ...er/Microsoft.CodeAnalysis.Razor.Compiler/src/Microsoft.CodeAnalysis.Razor.Compiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,38 @@
<None Update="RazorSourceGenerator.razorencconfig" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
<!-- SDK: src/RazorSdk/Tool/Microsoft.NET.Sdk.Razor.Tool.csproj -->
<InternalsVisibleTo Include="rzc" Key="$(RazorKey)" />

<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.ExternalAccess.LegacyEditor.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.Language.Legacy.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.Language.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.LanguageServer" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.LanguageServer.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.Microbenchmarks" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.Microbenchmarks.Compiler" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.ProjectEngineHost" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.ProjectEngineHost.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.Test.Common" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.Test.Common.Compiler" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.AspNetCore.Razor.Test.Common.Tooling" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Razor.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Razor.Workspaces" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Razor.Workspaces.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Remote.Razor" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.Remote.Razor.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Razor" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Razor.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.LegacyEditor.Razor" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.LegacyEditor.Razor.Test" Key="$(RazorKey)" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.RazorExtension" Key="$(RazorKey)" />
</ItemGroup>

</Project>
Loading
Loading