Skip to content

Initial pass at enabling prebuilt detection #67645

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
mmitche merged 17 commits into from
Apr 21, 2023
Merged

Initial pass at enabling prebuilt detection #67645

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
af4fda4
Initial pass at enabling prebuilt detection
mmitche Apr 4, 2023
58cc856
Revert M.W32.Registry version
mmitche Apr 5, 2023
6807396
Merge remote-tracking branch 'upstream/main' into enable-prebuilt-det…
mmitche Apr 7, 2023
6132e0f
Comment out exclusions
mmitche Apr 7, 2023
ef0030d
Update SBRP
mmitche Apr 7, 2023
9a766c2
Update SBRP
mmitche Apr 10, 2023
100c3b0
Progress
mmitche Apr 10, 2023
399367d
Update SBRPs
mmitche Apr 11, 2023
6d3843b
Re-add 7-transport and update DemoLogger to have correct nullability …
mmitche Apr 11, 2023
7e7a06c
Mark supported OS platforms
mmitche Apr 11, 2023
3008769
Move around attrs
mmitche Apr 11, 2023
2ebd4fe
Supported platform
mmitche Apr 11, 2023
6b3fed5
Update SourceBuildPrebuiltBaseline.xml
mmitche Apr 19, 2023
169e7a4
Merge remote-tracking branch 'upstream/main' into enable-prebuilt-det…
mmitche Apr 20, 2023
c715474
Gate ManagementObject use on IsOSPlatform(Windows)
mmitche Apr 20, 2023
95b2fee
Merge remote-tracking branch 'origin/enable-prebuilt-detection' into …
mmitche Apr 20, 2023
0e086a2
* out baseline
mmitche Apr 20, 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
2 changes: 1 addition & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
Expand Down
32 changes: 31 additions & 1 deletion eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
<UsageData>
<IgnorePatterns>
<UsagePattern IdentityGlob="*/*" />
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />

<!-- Needs SBRPs -->
<UsagePattern IdentityGlob="Microsoft.Build*/*16.10.0*" />
<UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/*7.0.0*" />
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.Analyzers/*3.3.4*" />
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.CSharp.CodeStyle/*4.3.0-1.final*" />
<UsagePattern IdentityGlob="Microsoft.CodeAnalysis.VisualBasic.CodeStyle/*4.3.0-1.final*" />
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/*1.0.0*" />
<UsagePattern IdentityGlob="System.Collections.Immutable/*7.0.0*" />
<UsagePattern IdentityGlob="System.Composition/*7.0.0*" />
<UsagePattern IdentityGlob="System.Composition.AttributedModel/*7.0.0*" />
<UsagePattern IdentityGlob="System.Composition.Convention/*7.0.0*" />
<UsagePattern IdentityGlob="System.Composition.Hosting/*7.0.0*" />
<UsagePattern IdentityGlob="System.Composition.Runtime/*7.0.0*" />
<UsagePattern IdentityGlob="System.Composition.TypedParts/*7.0.0*" />
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*4.7.0*" />
<UsagePattern IdentityGlob="System.IO.Pipelines/*7.0.0*" />
<UsagePattern IdentityGlob="System.Reflection.Metadata/*7.0.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*4.7.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.Xml/*4.7.0*" />
<UsagePattern IdentityGlob="System.Text.Encoding.CodePages/*7.0.0*" />
<UsagePattern IdentityGlob="System.Text.Encodings.Web/*7.0.0*" />
<UsagePattern IdentityGlob="System.Text.Json/*7.0.0*" />
<UsagePattern IdentityGlob="System.Threading.Channels/*7.0.0*" />

<!-- The ref pack versions should be updated to the p3 released versions, along with the SDK. At that
point the 8.0 ref pack prebuilts should go away -->
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/*8.0.0-preview.3.23164.14*" />
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/*8.0.0-preview.3.23165.3*" />
</IgnorePatterns>
</UsageData>
24 changes: 17 additions & 7 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="XliffTasks" Version="1.0.0-beta.21215.1">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>7e80445ee82adbf9a8e6ae601ac5e239d982afaa</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22409.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23203.1">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>ee790b0477953dd30ea83e0e47af909a04fd0ca3</Sha>
<Sha>33edde07d61cf7606d76ada765335fb81f1cbb71</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23204.3">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>2d28a5e97867316939ef8108f219a8de073d0f03</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23168.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b12f035e893c34ec2c965d75f6e21b7a2667e98d</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23165.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>b7fb98b199d0b1b6188da4f4bf4f5accddac98d4</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23165-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>3f43bf1b2dead2cb51f20dc47f6dfd7981248820</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.1.0-5.22128.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>5d10d428050c0d6afef30a072c4ae68776621877</Sha>
Expand Down
9 changes: 4 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@
<MicrosoftDiaSymReaderConverterXmlVersion>1.1.0-beta2-22302-02</MicrosoftDiaSymReaderConverterXmlVersion>
<MicrosoftDiaSymReaderNativeVersion>17.0.0-beta1.21524.1</MicrosoftDiaSymReaderNativeVersion>
<MicrosoftDiaSymReaderPortablePdbVersion>1.7.0-beta-21528-01</MicrosoftDiaSymReaderPortablePdbVersion>
<MicrosoftExtensionsLoggingVersion>5.0.0</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>5.0.0</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>6.0.0</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftIdentityModelClientsActiveDirectoryVersion>3.13.8</MicrosoftIdentityModelClientsActiveDirectoryVersion>
<MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>15.8.27812-alpha</MicrosoftInternalPerformanceCodeMarkersDesignTimeVersion>
<MicrosoftInternalVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropVersion>
Expand All @@ -117,7 +117,6 @@
<MicrosoftMetadataVisualizerVersion>1.0.0-beta3.21075.2</MicrosoftMetadataVisualizerVersion>
<MicrosoftNETBuildExtensionsVersion>2.2.101</MicrosoftNETBuildExtensionsVersion>
<MicrosoftNETCorePlatformsVersion>2.1.2</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCoreAppRefVersion>5.0.0</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETFrameworkReferenceAssembliesnet461Version>1.0.0</MicrosoftNETFrameworkReferenceAssembliesnet461Version>
<MicrosoftNETFrameworkReferenceAssembliesnet451Version>1.0.0</MicrosoftNETFrameworkReferenceAssembliesnet451Version>
<MicrosoftNETFrameworkReferenceAssembliesnet40Version>1.0.0</MicrosoftNETFrameworkReferenceAssembliesnet40Version>
Expand Down Expand Up @@ -203,7 +202,7 @@
<MicrosoftVisualStudioWinFormsInterfacesVersion>17.0.0-previews-4-31709-430</MicrosoftVisualStudioWinFormsInterfacesVersion>
<MicrosoftVisualStudioWorkspaceVSIntegrationVersion>17.1.11-preview-0002</MicrosoftVisualStudioWorkspaceVSIntegrationVersion>
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<MicrosoftWin32RegistryVersion>6.0.0</MicrosoftWin32RegistryVersion>
Copy link
Member Author

@mmitche mmitche Apr 5, 2023

Choose a reason for hiding this comment

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

@jaredpar What do you think here? safe to upgrade?

<MSBuildStructuredLoggerVersion>2.1.790</MSBuildStructuredLoggerVersion>
<MDbgVersion>0.1.0</MDbgVersion>
<MonoOptionsVersion>6.6.0.161</MonoOptionsVersion>
Expand Down Expand Up @@ -243,7 +242,7 @@
<SystemIOFileSystemPrimitivesVersion>4.3.0</SystemIOFileSystemPrimitivesVersion>
<SystemIOPipesAccessControlVersion>5.0.0</SystemIOPipesAccessControlVersion>
<SystemIOPipelinesVersion>7.0.0</SystemIOPipelinesVersion>
<SystemManagementVersion>5.0.0-preview.8.20407.11</SystemManagementVersion>
<SystemManagementVersion>7.0.0</SystemManagementVersion>
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
<SystemResourcesExtensionsVersion>7.0.0</SystemResourcesExtensionsVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
Expand Down