Skip to content

Commit c2d75c9

Browse files
authored
Fix SB ref assembly issue for System.ComponentModel.Composition (#4675)
1 parent 7c7e680 commit c2d75c9

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,17 @@
33

44
<UsageData>
55
<IgnorePatterns>
6+
<!-- Caused by dependency on System.ComponentModel.Composition.4.5.0. This version is overridden in full source-build. -->
7+
<UsagePattern IdentityGlob="Microsoft.NETCore.Platforms/2.0.0" />
68
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
79
<UsagePattern IdentityGlob="NuGet.Frameworks/6.5.0" />
10+
<!-- This version is overridden in full source-build. -->
11+
<UsagePattern IdentityGlob="System.ComponentModel.Composition/4.5.0" />
12+
<!-- Caused by dependency on System.ComponentModel.Composition.4.5.0. This version is overridden in full source-build. -->
13+
<UsagePattern IdentityGlob="System.Security.AccessControl/4.5.0" />
14+
<!-- Caused by dependency on System.ComponentModel.Composition.4.5.0. This version is overridden in full source-build. -->
15+
<UsagePattern IdentityGlob="System.Security.Permissions/4.5.0" />
16+
<!-- Caused by dependency on System.ComponentModel.Composition.4.5.0. This version is overridden in full source-build. -->
17+
<UsagePattern IdentityGlob="System.Security.Principal.Windows/4.5.0" />
818
</IgnorePatterns>
919
</UsageData>

eng/Version.Details.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
<Uri>https://github.com/nuget/nuget.client</Uri>
2929
<Sha>4ba7bfa82f894ec32a554ca8d2df143675c85735</Sha>
3030
</Dependency>
31+
<!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
32+
<Dependency Name="System.ComponentModel.Composition" Version="4.5.0">
33+
<Uri>https://github.com/dotnet/corefx</Uri>
34+
<Sha>30ab651fcb4354552bd4891619a0bdd81e0ebdbf</Sha>
35+
</Dependency>
3136
</ProductDependencies>
3237
<ToolsetDependencies>
3338
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23364.2">

eng/Versions.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
<RoslynBannedApiAnalyzersVersion>3.3.3</RoslynBannedApiAnalyzersVersion>
4343
<RoslynPublicApiAnalyzersVersion>3.3.4-beta1.21554.2</RoslynPublicApiAnalyzersVersion>
4444
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
45-
<SystemComponentModelCompositionForSourceBuildVersion>7.0.0</SystemComponentModelCompositionForSourceBuildVersion>
4645
<SystemComponentModelCompositionVersion>4.5.0</SystemComponentModelCompositionVersion>
4746
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
4847
<SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>

src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<When Condition=" '$(DotNetBuildFromSource)' == 'true' ">
88
<PropertyGroup>
99
<NuspecFile>Microsoft.TestPlatform.CLI.sourcebuild.nuspec</NuspecFile>
10-
<SystemComponentModelCompositionVersion>$(SystemComponentModelCompositionForSourceBuildVersion)</SystemComponentModelCompositionVersion>
1110
</PropertyGroup>
1211
</When>
1312
<Otherwise>

0 commit comments

Comments
 (0)