Merge remote-tracking branch 'dotnet/release/6.0-staging' into ResetO…

…OBs6017
dotnet · Apr 7, 2023 · 249dfc3 · 249dfc3
2 parents 9f208eb + b412149
commit 249dfc3
Show file tree

Hide file tree

Showing 38 changed files with 264 additions and 126 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -9,7 +9,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
-    <add key="darc-pub-dotnet-emsdk-253a56a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-253a56aa/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-3c730c2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3c730c2c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-wcf -->
     <!--  End: Package sources from dotnet-wcf -->

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,24 +1,24 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.22108.1">
+    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.23170.3">
       <Uri>https://github.com/dotnet/icu</Uri>
-      <Sha>183f41cd63abd8dcba7389c22d19ebad7df65bfa</Sha>
+      <Sha>f7c5d687a6c09a038fab7572d4b3dfe4a83b5d49</Sha>
     </Dependency>
-    <Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-preview.7.21417.1">
+    <Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-servicing.22205.1">
       <Uri>https://github.com/dotnet/msquic</Uri>
-      <Sha>98129287d56a5e0348c291ce4260e630b4aa510d</Sha>
+      <Sha>7312355e44fd230b7aa26c7190f3870391751476</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.15">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.17">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>253a56aaea0d63f84cc277cef649834f4c1798c6</Sha>
+      <Sha>3c730c2c99c521adabe9b67b74bdba3a682d66d7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.15">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.17">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>253a56aaea0d63f84cc277cef649834f4c1798c6</Sha>
+      <Sha>3c730c2c99c521adabe9b67b74bdba3a682d66d7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.15">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.17">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>253a56aaea0d63f84cc277cef649834f4c1798c6</Sha>
+      <Sha>3c730c2c99c521adabe9b67b74bdba3a682d66d7</Sha>
     </Dependency>
     <Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
       <Uri>https://github.com/dotnet/wcf</Uri>
@@ -102,49 +102,49 @@
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.21518.1">
+    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.23179.5">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7</Sha>
+      <Sha>394c6358ffc15856545904f295d7d2d5ce7d0df4</Sha>
     </Dependency>
-    <Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.23113.6">
+    <Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.23179.5">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>dc9053bd5cb930dab70bb04745ce69a1a113da78</Sha>
+      <Sha>394c6358ffc15856545904f295d7d2d5ce7d0df4</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.21518.1">
+    <Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.23179.5">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7</Sha>
+      <Sha>394c6358ffc15856545904f295d7d2d5ce7d0df4</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.21518.1">
+    <Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.23179.5">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7</Sha>
+      <Sha>394c6358ffc15856545904f295d7d2d5ce7d0df4</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.21518.1">
+    <Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.23179.5">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7</Sha>
+      <Sha>394c6358ffc15856545904f295d7d2d5ce7d0df4</Sha>
     </Dependency>
-    <Dependency Name="System.Net.TestData" Version="6.0.0-beta.21518.1">
+    <Dependency Name="System.Net.TestData" Version="6.0.0-beta.23179.5">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7</Sha>
+      <Sha>394c6358ffc15856545904f295d7d2d5ce7d0df4</Sha>
     </Dependency>
-    <Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.21518.1">
+    <Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.23179.5">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7</Sha>
+      <Sha>394c6358ffc15856545904f295d7d2d5ce7d0df4</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.21518.1">
+    <Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.23179.5">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7</Sha>
+      <Sha>394c6358ffc15856545904f295d7d2d5ce7d0df4</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.21518.1">
+    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.23179.5">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7</Sha>
+      <Sha>394c6358ffc15856545904f295d7d2d5ce7d0df4</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.21518.1">
+    <Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.23179.5">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7</Sha>
+      <Sha>394c6358ffc15856545904f295d7d2d5ce7d0df4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.21518.1">
+    <Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.23179.5">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7</Sha>
+      <Sha>394c6358ffc15856545904f295d7d2d5ce7d0df4</Sha>
     </Dependency>
     <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -246,9 +246,9 @@
       <Uri>https://github.com/dotnet/hotreload-utils</Uri>
       <Sha>802e79f0cf423249d54bfaafca2da4a272f4ca07</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.21518.1">
+    <Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.23179.5">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7</Sha>
+      <Sha>394c6358ffc15856545904f295d7d2d5ce7d0df4</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc1.21413.4">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,11 +1,11 @@
 <Project>
   <PropertyGroup>
     <!-- The .NET product branding version -->
-    <ProductVersion>6.0.16</ProductVersion>
+    <ProductVersion>6.0.17</ProductVersion>
     <!-- File version numbers -->
     <MajorVersion>6</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <PatchVersion>16</PatchVersion>
+    <PatchVersion>17</PatchVersion>
     <SdkBandVersion>6.0.400</SdkBandVersion>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>
@@ -108,18 +108,18 @@
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
     <runtimenativeSystemIOPortsVersion>6.0.0-rc.1.21415.6</runtimenativeSystemIOPortsVersion>
     <!-- Runtime-Assets dependencies -->
-    <SystemRuntimeNumericsTestDataVersion>6.0.0-beta.21518.1</SystemRuntimeNumericsTestDataVersion>
-    <SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.21518.1</SystemComponentModelTypeConverterTestDataVersion>
-    <SystemDataCommonTestDataVersion>6.0.0-beta.23113.6</SystemDataCommonTestDataVersion>
-    <SystemDrawingCommonTestDataVersion>6.0.0-beta.21518.1</SystemDrawingCommonTestDataVersion>
-    <SystemIOCompressionTestDataVersion>6.0.0-beta.21518.1</SystemIOCompressionTestDataVersion>
-    <SystemIOPackagingTestDataVersion>6.0.0-beta.21518.1</SystemIOPackagingTestDataVersion>
-    <SystemNetTestDataVersion>6.0.0-beta.21518.1</SystemNetTestDataVersion>
-    <SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.21518.1</SystemPrivateRuntimeUnicodeDataVersion>
-    <SystemRuntimeTimeZoneDataVersion>6.0.0-beta.21518.1</SystemRuntimeTimeZoneDataVersion>
-    <SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21518.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
-    <SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21518.1</SystemWindowsExtensionsTestDataVersion>
-    <MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.21518.1</MicrosoftDotNetCilStripSourcesVersion>
+    <SystemRuntimeNumericsTestDataVersion>6.0.0-beta.23179.5</SystemRuntimeNumericsTestDataVersion>
+    <SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.23179.5</SystemComponentModelTypeConverterTestDataVersion>
+    <SystemDataCommonTestDataVersion>6.0.0-beta.23179.5</SystemDataCommonTestDataVersion>
+    <SystemDrawingCommonTestDataVersion>6.0.0-beta.23179.5</SystemDrawingCommonTestDataVersion>
+    <SystemIOCompressionTestDataVersion>6.0.0-beta.23179.5</SystemIOCompressionTestDataVersion>
+    <SystemIOPackagingTestDataVersion>6.0.0-beta.23179.5</SystemIOPackagingTestDataVersion>
+    <SystemNetTestDataVersion>6.0.0-beta.23179.5</SystemNetTestDataVersion>
+    <SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.23179.5</SystemPrivateRuntimeUnicodeDataVersion>
+    <SystemRuntimeTimeZoneDataVersion>6.0.0-beta.23179.5</SystemRuntimeTimeZoneDataVersion>
+    <SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.23179.5</SystemSecurityCryptographyX509CertificatesTestDataVersion>
+    <SystemWindowsExtensionsTestDataVersion>6.0.0-beta.23179.5</SystemWindowsExtensionsTestDataVersion>
+    <MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.23179.5</MicrosoftDotNetCilStripSourcesVersion>
     <!-- dotnet-optimization dependencies -->
     <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx64MIBCRuntimeVersion>
     <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -162,9 +162,9 @@
     <MicrosoftNETILLinkTasksVersion>6.0.100-1.21459.1</MicrosoftNETILLinkTasksVersion>
     <MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
     <!-- ICU -->
-    <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.22108.1</MicrosoftNETCoreRuntimeICUTransportVersion>
+    <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.23170.3</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- MsQuic -->
-    <SystemNetMsQuicTransportVersion>6.0.0-preview.7.21417.1</SystemNetMsQuicTransportVersion>
+    <SystemNetMsQuicTransportVersion>6.0.0-servicing.22205.1</SystemNetMsQuicTransportVersion>
     <!-- Mono LLVM -->
     <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
     <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
@@ -175,9 +175,9 @@
     <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
     <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
     <!-- emscripten / Node -->
-    <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.15</MicrosoftNETWorkloadEmscriptenManifest60100Version>
-    <MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.15</MicrosoftNETWorkloadEmscriptenManifest60300Version>
-    <MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.15</MicrosoftNETWorkloadEmscriptenManifest60400Version>
+    <MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.17</MicrosoftNETWorkloadEmscriptenManifest60100Version>
+    <MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.17</MicrosoftNETWorkloadEmscriptenManifest60300Version>
+    <MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.17</MicrosoftNETWorkloadEmscriptenManifest60400Version>
     <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
     <!-- workloads -->
     <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

diff --git a/eng/packaging.targets b/eng/packaging.targets
@@ -51,7 +51,7 @@
     <_IsWindowsDesktopApp Condition="$(WindowsDesktopCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsWindowsDesktopApp>
     <_IsAspNetCoreApp Condition="$(AspNetCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsAspNetCoreApp>
     <_AssemblyInTargetingPack Condition="('$(IsNETCoreAppSrc)' == 'true' or '$(IsNetCoreAppRef)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true') and '$(TargetFrameworkIdentifier)' != '.NETFramework'">true</_AssemblyInTargetingPack>
-    <!-- Assembly version do not get updated in non-netfx ref pack assemblies. -->
+    <!-- The assembly version gets updated when the assembly isn't part of a targeting pack. -->
     <AssemblyVersion Condition="'$(_AssemblyInTargetingPack)' != 'true'">$(MajorVersion).$(MinorVersion).0.$(ServicingVersion)</AssemblyVersion>
   </PropertyGroup>
 

diff --git a/src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.cs b/src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.cs
@@ -19,10 +19,6 @@ internal static partial class procfs
         private const string FileDescriptorDirectoryName = "/fd/";
         private const string TaskDirectoryName = "/task/";
 
-        internal const string SelfExeFilePath = RootPath + "self" + ExeFileName;
-        internal const string SelfCmdLineFilePath = RootPath + "self" + CmdLineFileName;
-        internal const string ProcStatFilePath = RootPath + "stat";
-
         internal struct ParsedStat
         {
             // Commented out fields are available in the stat data file but

diff --git a/src/libraries/Common/src/Interop/Unix/System.Native/Interop.GetBootTimeTicks.cs b/src/libraries/Common/src/Interop/Unix/System.Native/Interop.GetBootTimeTicks.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static partial class Sys
+    {
+        [DllImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetBootTimeTicks")]
+        [SuppressGCTransition]
+        internal static extern long GetBootTimeTicks();
+    }
+}
diff --git a/src/libraries/Common/src/Roslyn/SyntaxValueProvider_ForAttributeWithSimpleName.cs b/src/libraries/Common/src/Roslyn/SyntaxValueProvider_ForAttributeWithSimpleName.cs
@@ -334,7 +334,16 @@ void processMember(
                         // For any other node, just keep recursing deeper to see if we can find an attribute. Note: we cannot
                         // terminate the search anywhere as attributes may be found on things like local functions, and that
                         // means having to dive deep into statements and expressions.
-                        foreach (var child in node.ChildNodesAndTokens().Reverse())
+                        var childNodesAndTokens = node.ChildNodesAndTokens();
+
+                        // Avoid performance issue in ChildSyntaxList when iterating the child list in reverse
+                        // (see https://github.com/dotnet/roslyn/issues/66475) by iterating forward first to
+                        // ensure child nodes are realized.
+                        foreach (var childNode in childNodesAndTokens)
+                        {
+                        }
+
+                        foreach (var child in childNodesAndTokens.Reverse())
                         {
                             if (child.IsNode)
                                 nodeStack.Append(child.AsNode()!);

diff --git a/...soft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj b/...soft.Extensions.Logging.Abstractions/src/Microsoft.Extensions.Logging.Abstractions.csproj
@@ -17,7 +17,8 @@ Microsoft.Extensions.Logging.LogLevel
 Microsoft.Extensions.Logging.Logger&lt;T&gt;
 Microsoft.Extensions.Logging.LoggerMessage
 Microsoft.Extensions.Logging.Abstractions.NullLogger</PackageDescription>
-    <ServicingVersion>3</ServicingVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <ServicingVersion>4</ServicingVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/.../tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs b/.../tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs
@@ -742,6 +742,40 @@ partial class C
             Assert.Equal(21, generatedSources[0].SourceText.Lines.Count);
         }
 
+        [Fact]
+        public static void SyntaxListWithManyItems()
+        {
+            const int nItems = 200000;
+            var builder = new System.Text.StringBuilder();
+            builder.AppendLine(
+                @"
+                using Microsoft.Extensions.Logging;
+                class Program
+                {
+                    [LoggerMessage(EventId = 1, Level = LogLevel.Debug, Message = ""M1"")]
+                    static partial void M1(ILogger logger)
+                    {
+                ");
+            builder.AppendLine("    int[] values = new[] { ");
+            for (int i = 0; i < nItems; i++)
+            {
+                builder.Append("0, ");
+            }
+            builder.AppendLine("};");
+            builder.AppendLine("}");
+            builder.AppendLine("}");
+
+            string source = builder.ToString();
+            Compilation compilation = CompilationHelper.CreateCompilation(source);
+            LoggerMessageGenerator generator = new LoggerMessageGenerator();
+
+            (ImmutableArray<Diagnostic> diagnostics, _) =
+                RoslynTestUtils.RunGenerator(compilation, generator);
+
+            Assert.Single(diagnostics);
+            Assert.Equal(DiagnosticDescriptors.LoggingMethodHasBody.Id, diagnostics[0].Id);
+        }
+
         private static async Task<IReadOnlyList<Diagnostic>> RunGenerator(
             string code,
             bool wrap = true,

diff --git a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj
@@ -5,8 +5,8 @@
     <!-- Reference the outputs for the dependency nodes calculation. -->
     <NoTargetsDoNotReferenceOutputAssemblies>false</NoTargetsDoNotReferenceOutputAssemblies>
     <IsPackable>true</IsPackable>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <ServicingVersion>4</ServicingVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <ServicingVersion>5</ServicingVersion>
     <!-- This is a meta package and doesn't contain any libs. -->
     <NoWarn>$(NoWarn);NU5128</NoWarn>
     <PackageDescription>This Windows Compatibility Pack provides access to APIs that were previously available only for .NET Framework. It can be used from both .NET Core as well as .NET Standard.</PackageDescription>

diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt
@@ -220,6 +220,7 @@ else ()
 endif ()
 
 if (CLR_CMAKE_TARGET_LINUX)
+   add_definitions(-DTARGET_LINUX)
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE")
 endif ()
 

diff --git a/src/libraries/Native/Unix/System.Native/entrypoints.c b/src/libraries/Native/Unix/System.Native/entrypoints.c
@@ -235,6 +235,7 @@ static const Entry s_sysNative[] =
     DllImportEntry(SystemNative_LowLevelMonitor_Signal_Release)
     DllImportEntry(SystemNative_UTimensat)
     DllImportEntry(SystemNative_GetTimestamp)
+    DllImportEntry(SystemNative_GetBootTimeTicks)
     DllImportEntry(SystemNative_GetCpuUtilization)
     DllImportEntry(SystemNative_GetPwUidR)
     DllImportEntry(SystemNative_GetPwNamR)