Skip to content

Commit fd3c878

Browse files
authored
[automated] Merge branch 'release/7.0.4xx' => 'release/8.0.1xx' (#40263)
2 parents d2c9a82 + 09d65d1 commit fd3c878

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<MicrosoftCssParserVersion>1.0.0-20230414.1</MicrosoftCssParserVersion>
2828
<MicrosoftApplicationInsightsPackageVersion>2.21.0</MicrosoftApplicationInsightsPackageVersion>
2929
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
30+
<NETStandardLibraryVersion>2.0.3</NETStandardLibraryVersion>
3031
<NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
3132
<StyleCopAnalyzersPackageVersion>1.2.0-beta.435</StyleCopAnalyzersPackageVersion>
3233
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>

src/BuiltInTools/dotnet-watch/dotnet-watch.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
Avoids picking up an old version via transitive dependency from Microsoft.Build or Microsoft.CodeAnalysis.Workspaces.MSBuild.
3636
-->
3737
<PackageReference Include="System.Text.Json" />
38+
<!-- Lift dependency of NETStandard.Library.NETFramework to version produced in SBRP. -->
39+
<PackageReference Include="NETStandard.Library" VersionOverride="$(NETStandardLibraryVersion)" ExcludeAssets="All" />
3840

3941
<Compile Include="$(RepoRoot)src\Common\PathUtilities.cs" LinkBase="Common" />
4042
</ItemGroup>

src/Cli/dotnet/dotnet.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@
101101
<PackageReference Include="System.ServiceProcess.ServiceController" />
102102
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets="All" ExcludeAssets="Runtime" Condition="'$(DotNetBuildFromSource)' != 'true'" />
103103
<PackageReference Include="Microsoft.Windows.CsWin32" IncludeAssets="all" Condition="'$(DotNetBuildFromSource)' != 'true'" />
104+
<!-- Lift dependency of NETStandard.Library.NETFramework to version produced in SBRP. -->
105+
<PackageReference Include="NETStandard.Library" VersionOverride="$(NETStandardLibraryVersion)" ExcludeAssets="All" />
104106
</ItemGroup>
105107
<ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
106108
<PackageReference Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" />

src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" />
4949
<PackageReference Include="NETStandard.Library.NETFramework" ExcludeAssets="All" NoWarn="NU1701" />
5050
<!-- Lift dependency of NETStandard.Library.NETFramework to version produced in SBRP. -->
51-
<PackageReference Include="NETStandard.Library" VersionOverride="2.0.3" ExcludeAssets="All" />
51+
<PackageReference Include="NETStandard.Library" VersionOverride="$(NETStandardLibraryVersion)" ExcludeAssets="All" />
5252
</ItemGroup>
5353

5454
<ItemGroup>

0 commit comments

Comments
 (0)