Skip to content

Commit 557c9c9

Browse files
authored
Merge pull request #114668 from dotnet/merge/release/8.0-to-release/8.0-staging
[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
2 parents f8a6297 + 4f67954 commit 557c9c9

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<add key="darc-pub-dotnet-emsdk-29119a8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-29119a81/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-adc0d6e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!-- Begin: Package sources from dotnet-sdk -->
1515
<!-- End: Package sources from dotnet-sdk -->

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@
9292
</Dependency>
9393
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.16">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>29119a816b59b6d35447ce71606287d1c2c9a39a</Sha>
95+
<Sha>adc0d6e7d3abb9c4ecee2420c51ae99c57dc9755</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.16-servicing.25203.1">
97+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.16-servicing.25211.4">
9898
<Uri>https://github.com/dotnet/emsdk</Uri>
99-
<Sha>29119a816b59b6d35447ce71606287d1c2c9a39a</Sha>
99+
<Sha>adc0d6e7d3abb9c4ecee2420c51ae99c57dc9755</Sha>
100100
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
101101
</Dependency>
102102
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">

src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppPrevious)-windows;$(NetCoreAppPrevious);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
<IsPackable>true</IsPackable>
6-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
77
<ServicingVersion>2</ServicingVersion>
88
<PackageDescription>Provides the System.Diagnostics.EventLog class, which allows the applications to use the Windows event log service.
99

src/libraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
66
<IsPackable>true</IsPackable>
7-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
7+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
88
<ServicingVersion>1</ServicingVersion>
99
<AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
1010
<AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage>

src/libraries/System.Private.Xml/src/System.Private.Xml.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<RootNamespace>System.Xml</RootNamespace>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<EnableAOTAnalyzer>false</EnableAOTAnalyzer>
7-
<IsPackable>true</IsPackable>
8-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
9-
<ServicingVersion>1</ServicingVersion>
107
</PropertyGroup>
118

129
<ItemGroup>

0 commit comments

Comments
 (0)