Skip to content

Add SBRP attribute #794

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 9 commits into from
Oct 16, 2023
Merged

Add SBRP attribute #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ba2ae03
Add SBRP attribute
ellahathaway Sep 28, 2023
88b8727
Generate SBRP attribute with PackageSourceGenerator
ellahathaway Oct 2, 2023
b6e2ed6
Generalize adding attribute to CSharp file
ellahathaway Oct 9, 2023
95dae83
Update CSharp file attributes
ellahathaway Oct 9, 2023
a69a6d7
Add attributes to beginning of file
ellahathaway Oct 9, 2023
dc62e8b
Use msbuild to add attribute
ellahathaway Oct 10, 2023
b0d320b
Revert PackageSourceGenerator changes
ellahathaway Oct 10, 2023
2347c49
Build with CSharp file
ellahathaway Oct 13, 2023
60266f8
Rename file, add license header, fix spacing, use different compile item
ellahathaway Oct 13, 2023
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
4 changes: 4 additions & 0 deletions src/SourceBuildAssemblyMetdata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

[assembly: System.Reflection.AssemblyMetadata("source", "source-build-reference-packages")]
5 changes: 5 additions & 0 deletions src/referencePackages/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<Project>

<Import Project="..\..\Directory.Build.props" />

<ItemGroup>
<!-- Attributes for all Reference Packages -->
<Compile Include="$(RepoRoot)src\SourceBuildAssemblyMetdata.cs" />
</ItemGroup>

<PropertyGroup>
<!-- Common properties for all Reference Packages -->
Expand Down
10 changes: 8 additions & 2 deletions src/referencePackages/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,18 @@

<Target Name="CopyBuildOutputToTempOutput"
AfterTargets="CopyFilesToOutputDirectory">

<ItemGroup>
<CompileForRelativePath Include="@(Compile)" />
<CompileForRelativePath Remove="$(RepoRoot)src\SourceBuildAssemblyMetdata.cs" />
</ItemGroup>

<Error
Condition="@(Compile->Count()) != 1"
Condition="@(CompileForRelativePath->Count()) != 1"
Text="Number of Compile items != 1. We need just one, to determine the path of the resulting DLL in the package including ref/lib and TFM." />

<ItemGroup>
<FullCompileDir Include="$([System.IO.Directory]::GetParent('%(Compile.Identity)'))" />
<FullCompileDir Include="$([System.IO.Directory]::GetParent('%(CompileForRelativePath.Identity)'))" />
<RelativeCompileDir Include="$([MSBuild]::MakeRelative('$(MSBuildProjectDirectory)\', '%(FullCompileDir.Identity)'))" />
</ItemGroup>

Expand Down
2 changes: 0 additions & 2 deletions ...src/system.collections.immutable/6.0.0/lib/netstandard2.0/System.Collections.Immutable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("6.0.21.52210")]
[assembly: AssemblyInformationalVersion("6.0.21.52210 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
Comment on lines -24 to -26
Copy link
Member

Choose a reason for hiding this comment

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

How did these did here in the first place? Was it via automation or were they manually added?

Copy link
Member

Choose a reason for hiding this comment

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

We were previously generating these attributes prior to the refactoring to use GenAPI. These are the few packages that have not been regenerated with the new tooling - tracked with dotnet/source-build#3459

[assembly: AssemblyVersion("6.0.0.0")]


Expand Down
2 changes: 0 additions & 2 deletions src/referencePackages/src/system.runtime/4.1.0/ref/netstandard1.0/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("4.0.30319.17929")]
[assembly: AssemblyInformationalVersion("4.0.30319.17929 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
[assembly: AssemblyVersion("4.0.0.0")]


Expand Down
2 changes: 0 additions & 2 deletions src/referencePackages/src/system.runtime/4.1.0/ref/netstandard1.2/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("4.0.40013.0")]
[assembly: AssemblyInformationalVersion("4.0.40013.0 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
[assembly: AssemblyVersion("4.0.10.0")]


Expand Down
2 changes: 0 additions & 2 deletions src/referencePackages/src/system.runtime/4.1.0/ref/netstandard1.3/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("4.6.23123.00")]
[assembly: AssemblyInformationalVersion("4.6.23123.00 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
[assembly: AssemblyVersion("4.0.20.0")]


Expand Down
2 changes: 0 additions & 2 deletions src/referencePackages/src/system.runtime/4.1.0/ref/netstandard1.5/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("1.0.24212.01")]
[assembly: AssemblyInformationalVersion("1.0.24212.01 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
[assembly: AssemblyVersion("4.1.0.0")]


Expand Down
2 changes: 0 additions & 2 deletions src/referencePackages/src/system.runtime/4.3.0/ref/netstandard1.0/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("4.0.30319.17929")]
[assembly: AssemblyInformationalVersion("4.0.30319.17929 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
[assembly: AssemblyVersion("4.0.0.0")]


Expand Down
2 changes: 0 additions & 2 deletions src/referencePackages/src/system.runtime/4.3.0/ref/netstandard1.2/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("4.0.40013.0")]
[assembly: AssemblyInformationalVersion("4.0.40013.0 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
[assembly: AssemblyVersion("4.0.10.0")]


Expand Down
2 changes: 0 additions & 2 deletions src/referencePackages/src/system.runtime/4.3.0/ref/netstandard1.3/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("4.6.23123.00")]
[assembly: AssemblyInformationalVersion("4.6.23123.00 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
[assembly: AssemblyVersion("4.0.20.0")]


Expand Down
2 changes: 0 additions & 2 deletions src/referencePackages/src/system.runtime/4.3.0/ref/netstandard1.5/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("1.0.24212.01")]
[assembly: AssemblyInformationalVersion("1.0.24212.01 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
[assembly: AssemblyVersion("4.1.0.0")]


Expand Down
2 changes: 0 additions & 2 deletions src/referencePackages/src/system.runtime/4.3.1/ref/netstandard1.0/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("4.0.30319.17929")]
[assembly: AssemblyInformationalVersion("4.0.30319.17929 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
[assembly: AssemblyVersion("4.0.0.0")]


Expand Down
2 changes: 0 additions & 2 deletions src/referencePackages/src/system.runtime/4.3.1/ref/netstandard1.2/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("4.0.40013.0")]
[assembly: AssemblyInformationalVersion("4.0.40013.0 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
[assembly: AssemblyVersion("4.0.10.0")]


Expand Down
2 changes: 0 additions & 2 deletions src/referencePackages/src/system.runtime/4.3.1/ref/netstandard1.3/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("4.6.23123.00")]
[assembly: AssemblyInformationalVersion("4.6.23123.00 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
[assembly: AssemblyVersion("4.0.20.0")]


Expand Down
2 changes: 0 additions & 2 deletions src/referencePackages/src/system.runtime/4.3.1/ref/netstandard1.5/System.Runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
[assembly: AssemblyProduct("Microsoft® .NET Framework")]
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
[assembly: AssemblyFileVersion("1.0.24212.01")]
[assembly: AssemblyInformationalVersion("1.0.24212.01 built by: SOURCEBUILD")]
[assembly: CLSCompliant(true)]
[assembly: AssemblyMetadata("", "")]
[assembly: AssemblyVersion("4.1.0.0")]


Expand Down
5 changes: 5 additions & 0 deletions src/targetPacks/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<Project>
<Import Project="..\..\Directory.Build.props" />

<ItemGroup>
<!-- Attributes for all Target Packages -->
<Compile Include="$(RepoRoot)src\SourceBuildAssemblyMetdata.cs" />
</ItemGroup>

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput>
Expand Down