Skip to content

[main] Update dotnet/runtime#35048

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
marcpopMSFT merged 32 commits into from
Sep 20, 2023
Merged

[main] Update dotnet/runtime #35048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5a7e1f2
[main] Update dotnet/runtime
lewing Aug 30, 2023
ac96fe8
Fix SharedFramework too
lewing Aug 30, 2023
09e6547
Update the variable used in global.json too
lewing Aug 30, 2023
8bed3cf
Update global.json
Aug 31, 2023
98927b2
Update blazor web tag
Aug 31, 2023
ab87475
Update blazor web tag for osx and linux
Sep 1, 2023
ef8f565
Update global.json
lewing Sep 1, 2023
f8f8fc2
Bump runtime dependencies
lewing Sep 2, 2023
4e46d4a
Bump tools packages to net8
agocke Sep 5, 2023
c6361e1
Suppress TFM build warnings temporarily
agocke Sep 5, 2023
e4063cf
Update to more recent runtime build
lewing Sep 5, 2023
3cc46c9
Update Directory.Build.props
lewing Sep 5, 2023
4593590
revert net9.0 target
lewing Sep 6, 2023
54e2592
Bump XUnitRunner TFM
nagilson Sep 6, 2023
bb4134f
Disable transitive pinning as there are conflicts in SRM which we can…
marcpopMSFT Sep 7, 2023
01a01e5
Merge remote-tracking branch 'origin/main' into update-emsdk-manifest
marcpopMSFT Sep 8, 2023
38e3276
Reenable transitive pinning and apply a fix to the package that was c…
marcpopMSFT Sep 8, 2023
71cc422
Switch a test to be self-contained. Not sure why this particular test…
marcpopMSFT Sep 8, 2023
90ee7e0
Ran update-test-baselines.ps1
marcpopMSFT Sep 9, 2023
3cd48fd
Target a test to be self-contained
marcpopMSFT Sep 13, 2023
0bdd9e7
Merge remote-tracking branch 'origin/main' into update-emsdk-manifest
marcpopMSFT Sep 13, 2023
42f534a
don't overwrite bundledversions unless the SemVer major values match
baronfel Sep 13, 2023
f8ef959
Add an additional dependency that's flagged in the tests.
marcpopMSFT Sep 13, 2023
a1ee049
Remove the cryptography reference per PR feedback
marcpopMSFT Sep 13, 2023
4ecccd1
Bump runtime build
lewing Sep 15, 2023
882db45
Fix blazor tests built with workloads
radical Sep 15, 2023
ef678de
Use WasmOverride.targets only for net8.0 wasm projects
radical Sep 15, 2023
ab71881
Merge branch 'main' into update-emsdk-manifest
marek-safar Sep 18, 2023
ce306be
Fix native aot lib test scenario
LakshanF Sep 18, 2023
d1f1784
Update versions to official RC1
mthalman Sep 19, 2023
ca8ddf9
Remove Microsoft.NETCore.DotNetHostResolver dependency
elinor-fung Sep 19, 2023
26162bd
Update SourceBuildPrebuiltBaseline.xml for 8.0 msbuild dependencies
marcpopMSFT Sep 19, 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
6 changes: 4 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@
<IncludeSymbols>true</IncludeSymbols>
<IsShippingPackage>false</IsShippingPackage>
<SdkTargetFramework>net8.0</SdkTargetFramework>
<!-- Temporarily disable build warnings while upgrading to the net9.0 TFM -->
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
Comment on lines +15 to +16

@ViktorHoferViktorHoferSep 7, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why is that needed? That switch isn't intended to be set by our own repositories. It's a last effort escape switch.

@marcpopMSFTmarcpopMSFTSep 7, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The build was throwing a massive number of errors about incompatible runtime targeting. In prior years, we have not had to retarget the SDK before merging in a new runtime so this seems to be a new error:
https://dev.azure.com/dnceng-public/public/_build/results?buildId=393849&view=logs&j=fa59fe4e-195c-56fa-189b-58fd241f10dd&t=e0ea3df6-0956-547c-f7b9-9062676d48ed

@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

So adding that flag was to suppress the error so we could get runtime merged and then retarget later (last year, retargetting happened ~3 months after rebranding)

@ViktorHoferViktorHoferSep 7, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

dotnet/runtime retargeting happen soon after rebranding this year while that happened around December last year. That's probably the reason why you weren't impacted by this.

IMO it makes sense to do the retargeting here as part of consuming the new runtime. IIRC that's what we did in the previous releases, before .NET 7. But if this switch is just here for a few weeks, I'm fine with that.

@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ahh, I didn't realize runtime was that late last time around. That explains it. I'd like to take this whatever the shortest path to fixing the failures is

<ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>

<!-- VS for Mac may run on a lower version of .NET than the SDK is targeting, but needs to load the resolvers. So the resolvers and dependencies
may target a lower version of .NET -->
<ResolverTargetFramework>net7.0</ResolverTargetFramework>
<ResolverTargetFramework>net8.0</ResolverTargetFramework>
<!-- Source build does not need to worry about running on VS for Mac -->
<ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>

Expand Down
5 changes: 5 additions & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,10 @@
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />

<!-- msbuild is still on 8.0 versions of these so we have to pin in SDK main for now or tasks will fail -->
<UsagePattern IdentityGlob="Microsoft.NET.HostModel/*8.0.0*" />
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyModel/*8.0.0*" />
<UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/*8.0.0*" />
</IgnorePatterns>
</UsageData>
72 changes: 34 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,46 +14,42 @@
<Sha>9dfddc30a1e9101f7e44dcda57d95902073e444c</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23421.3">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23421.3">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-rc.1.23421.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23421.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-rc.1.23421.3">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-rc.1.23421.3">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-rc.1.23421.3">
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23421.3">
<Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-rc.1.23421.3">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23411.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-alpha.1.23457.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>abfa03c97f4175d4d209435cd0e71f558e36c3fd</Sha>
<Sha>7da45c33d57a762de5756f2c090e84327dae143f</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.8.0-preview-23462-02">
Expand DownExpand Up@@ -197,25 +193,25 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>bb99e3ea07aaecd62d5c59568524133317d081b4</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23421.3">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="8.0.0-rc.1.23421.3">
<Dependency Name="System.CodeDom" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-rc.1.23421.3">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23421.3">
<Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="8.0.0-rc.1.23421.3">
<Dependency Name="System.Resources.Extensions" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-alpha.1.23456.3">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand DownExpand Up@@ -390,19 +386,19 @@
<SourceBuild RepoName="symreader" ManagedOnly="true" />
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23421.3">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-rc.1.23421.3">
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23421.3">
<Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand All@@ -423,9 +419,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-rc.1.23421.3">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-alpha.1.23464.19">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
<Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down
37 changes: 18 additions & 19 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,31 +35,30 @@
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23463.1</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-rc.1.23421.3</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-alpha.1.23464.19</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-rc.1.23421.3</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-alpha.1.23464.19</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23463.1</MicrosoftDeploymentDotNetReleasesVersion>
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23421.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23464.19</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.0-rc.1.23421.3</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>9.0.0-alpha.1.23464.19</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>8.0.0-rc.1.23421.3</SystemServiceProcessServiceControllerVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>9.0.0-alpha.1.23464.19</SystemServiceProcessServiceControllerVersion>
<MicrosoftExtensionsLoggingPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
</PropertyGroup>
Expand DownExpand Up@@ -88,9 +87,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>8.0.0-rc.1.23421.3</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>8.0.0-rc.1.23421.3</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>8.0.0-rc.1.23421.3</SystemResourcesExtensionsPackageVersion>
<SystemCodeDomPackageVersion>9.0.0-alpha.1.23464.19</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.0-alpha.1.23464.19</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>9.0.0-alpha.1.23464.19</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/format -->
Expand DownExpand Up@@ -208,13 +207,13 @@
</PropertyGroup>
<PropertyGroup>
<!-- Workloads from dotnet/emsdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-rc.1.23411.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-alpha.1.23457.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
<EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
<EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
<!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
<!-- mono workload prerelease version band must match the runtime feature band -->
<MonoWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
<MonoWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
"tools": {
"dotnet": "8.0.100-preview.7.23376.3",
"dotnet": "9.0.100-alpha.1.23421.9",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
],
"aspnetcore": [
"$(MicrosoftAspNetCoreAppRefPackageVersion)"
Expand Down
2 changes: 1 addition & 1 deletion src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
<TargetFrameworks>net8.0;net472</TargetFrameworks>
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
<Nullable>enable</Nullable>
<StrongNameKeyId>Open</StrongNameKeyId>
Expand Down
2 changes: 1 addition & 1 deletion src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0</TargetFramework>
<OutputType>Exe</OutputType>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
<TargetFrameworks>net8.0;net472</TargetFrameworks>
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
<StrongNameKeyId>Open</StrongNameKeyId>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
<TargetFrameworks>net8.0;net472</TargetFrameworks>
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
<StrongNameKeyId>Open</StrongNameKeyId>
<Nullable>enable</Nullable>
Expand Down
1 change: 1 addition & 0 deletions src/Assets/WasmOverride/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
<Project />
4 changes: 4 additions & 0 deletions src/Assets/WasmOverride/Directory.Build.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
<Project>
<!-- Overriding only when workload is installed, and targeting net8.0 -->
<Import Project="WasmOverridePacks.targets" Condition="'$(WasmNativeWorkload)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '8.0'))" />
</Project>
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[main] Update dotnet/runtime by lewing · Pull Request #35048 · dotnet/sdk · GitHub
Skip to content
[main] Update dotnet/runtime#35048

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

marcpopMSFT
merged 32 commits into

from

Sep 20, 2023
 Merged


[main] Update dotnet/runtime
#35048
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


32 commits


Select commit
Hold shift + click to select a range
5a7e1f2

[main] Update dotnet/runtime


lewing Aug 30, 2023
ac96fe8

Fix SharedFramework too


lewing Aug 30, 2023
09e6547

Update the variable used in global.json too


lewing Aug 30, 2023
8bed3cf

Update global.json

Aug 31, 2023
98927b2

Update blazor web tag

Aug 31, 2023
ab87475

Update blazor web tag for osx and linux

Sep 1, 2023
ef8f565

Update global.json


lewing Sep 1, 2023
f8f8fc2

Bump runtime dependencies


lewing Sep 2, 2023
4e46d4a

Bump tools packages to net8


agocke Sep 5, 2023
c6361e1

Suppress TFM build warnings temporarily


agocke Sep 5, 2023
e4063cf

Update to more recent runtime build


lewing Sep 5, 2023
3cc46c9

Update Directory.Build.props


lewing Sep 5, 2023
4593590

revert net9.0 target


lewing Sep 6, 2023
54e2592

Bump XUnitRunner TFM


nagilson Sep 6, 2023
bb4134f

Disable transitive pinning as there are conflicts in SRM which we can…


marcpopMSFT Sep 7, 2023
01a01e5

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 8, 2023
38e3276

Reenable transitive pinning and apply a fix to the package that was c…


marcpopMSFT Sep 8, 2023
71cc422

Switch a test to be self-contained. Not sure why this particular test…


marcpopMSFT Sep 8, 2023
90ee7e0

Ran update-test-baselines.ps1


marcpopMSFT Sep 9, 2023
3cd48fd

Target a test to be self-contained


marcpopMSFT Sep 13, 2023
0bdd9e7

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 13, 2023
42f534a

don't overwrite bundledversions unless the SemVer major values match


baronfel Sep 13, 2023
f8ef959

Add an additional dependency that's flagged in the tests.


marcpopMSFT Sep 13, 2023
a1ee049

Remove the cryptography reference per PR feedback


marcpopMSFT Sep 13, 2023
4ecccd1

Bump runtime build


lewing Sep 15, 2023
882db45

Fix blazor tests built with workloads


radical Sep 15, 2023
ef678de

Use WasmOverride.targets only for net8.0 wasm projects


radical Sep 15, 2023
ab71881

Merge branch 'main' into update-emsdk-manifest


marek-safar Sep 18, 2023
ce306be

Fix native aot lib test scenario


LakshanF Sep 18, 2023
d1f1784

Update versions to official RC1


mthalman Sep 19, 2023
ca8ddf9

Remove Microsoft.NETCore.DotNetHostResolver dependency


elinor-fung Sep 19, 2023
26162bd

Update SourceBuildPrebuiltBaseline.xml for 8.0 msbuild dependencies


marcpopMSFT Sep 19, 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


6 changes: 4 additions & 2 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@
 <IncludeSymbols>true</IncludeSymbols>
 <IsShippingPackage>false</IsShippingPackage>
 <SdkTargetFramework>net8.0</SdkTargetFramework>
 <!-- Temporarily disable build warnings while upgrading to the net9.0 TFM -->
 <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>

Comment on lines

+15
 to 
+16

@ViktorHoferViktorHoferSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Why is that needed? That switch isn't intended to be set by our own repositories. It's a last effort escape switch.
@marcpopMSFTmarcpopMSFTSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The build was throwing a massive number of errors about incompatible runtime targeting. In prior years, we have not had to retarget the SDK before merging in a new runtime so this seems to be a new error:
https://dev.azure.com/dnceng-public/public/_build/results?buildId=393849&view=logs&j=fa59fe4e-195c-56fa-189b-58fd241f10dd&t=e0ea3df6-0956-547c-f7b9-9062676d48ed
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

So adding that flag was to suppress the error so we could get runtime merged and then retarget later (last year, retargetting happened ~3 months after rebranding)
@ViktorHoferViktorHoferSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

dotnet/runtime retargeting happen soon after rebranding this year while that happened around December last year. That's probably the reason why you weren't impacted by this.
IMO it makes sense to do the retargeting here as part of consuming the new runtime. IIRC that's what we did in the previous releases, before .NET 7. But if this switch is just here for a few weeks, I'm fine with that.
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

ahh, I didn't realize runtime was that late last time around. That explains it. I'd like to take this whatever the shortest path to fixing the failures is
 <ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>

 <!-- VS for Mac may run on a lower version of .NET than the SDK is targeting, but needs to load the resolvers. So the resolvers and dependencies
 may target a lower version of .NET -->
 <ResolverTargetFramework>net7.0</ResolverTargetFramework>
 <ResolverTargetFramework>net8.0</ResolverTargetFramework>
 <!-- Source build does not need to worry about running on VS for Mac -->
 <ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>

Expand Down

5 changes: 5 additions & 0 deletions
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,10 @@
 <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />

 <!-- msbuild is still on 8.0 versions of these so we have to pin in SDK main for now or tasks will fail -->
 <UsagePattern IdentityGlob="Microsoft.NET.HostModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/*8.0.0*" />
 </IgnorePatterns>
</UsageData>

72 changes: 34 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,46 +14,42 @@
 <Sha>9dfddc30a1e9101f7e44dcda57d95902073e444c</Sha>
 <SourceBuild RepoName="templating" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 <SourceBuild RepoName="runtime" ManagedOnly="false" />
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23411.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-alpha.1.23457.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Uri>https://github.com/dotnet/emsdk</Uri>
 <Sha>abfa03c97f4175d4d209435cd0e71f558e36c3fd</Sha>
 <Sha>7da45c33d57a762de5756f2c090e84327dae143f</Sha>
 <SourceBuild RepoName="emsdk" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.Build" Version="17.8.0-preview-23462-02">
Expand DownExpand Up@@ -197,25 +193,25 @@
 <Uri>https://github.com/microsoft/vstest</Uri>
 <Sha>bb99e3ea07aaecd62d5c59568524133317d081b4</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.CodeDom" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.CodeDom" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Resources.Extensions" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Resources.Extensions" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-alpha.1.23456.3">
 <Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand DownExpand Up@@ -390,19 +386,19 @@
 <SourceBuild RepoName="symreader" ManagedOnly="true" />
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
Expand All@@ -423,9 +419,9 @@
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
 </Dependency>
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down

37 changes: 18 additions & 19 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,31 +35,30 @@
 <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
 <MicrosoftDotNetSignToolVersion>8.0.0-beta.23463.1</MicrosoftDotNetSignToolVersion>
 <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-rc.1.23421.3</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-alpha.1.23464.19</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
 <SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
 <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
 <SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
 <SystemReflectionMetadataLoadContextVersion>8.0.0-rc.1.23421.3</SystemReflectionMetadataLoadContextVersion>
 <SystemReflectionMetadataLoadContextVersion>9.0.0-alpha.1.23464.19</SystemReflectionMetadataLoadContextVersion>
 <SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
 <SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
 <MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23463.1</MicrosoftDeploymentDotNetReleasesVersion>
 <MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23421.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23464.19</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
 <MicrosoftNETHostModelVersion>8.0.0-rc.1.23421.3</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETHostModelVersion>9.0.0-alpha.1.23464.19</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>8.0.0-rc.1.23421.3</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>9.0.0-alpha.1.23464.19</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingPackageVersion>
 <MicrosoftExtensionsLoggingAbstractionsPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
 </PropertyGroup>
Expand DownExpand Up@@ -88,9 +87,9 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <SystemCodeDomPackageVersion>8.0.0-rc.1.23421.3</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>8.0.0-rc.1.23421.3</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>8.0.0-rc.1.23421.3</SystemResourcesExtensionsPackageVersion>
 <SystemCodeDomPackageVersion>9.0.0-alpha.1.23464.19</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>9.0.0-alpha.1.23464.19</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>9.0.0-alpha.1.23464.19</SystemResourcesExtensionsPackageVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/format -->
Expand DownExpand Up@@ -208,13 +207,13 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Workloads from dotnet/emsdk -->
 <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-rc.1.23411.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-alpha.1.23457.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <!-- emsdk workload prerelease version band must match the emsdk feature band -->
 <EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->
 <MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
 <!-- mono workload prerelease version band must match the runtime feature band -->
 <MonoWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 <MonoWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 </PropertyGroup>
</Project>

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3",
 "dotnet": "9.0.100-alpha.1.23421.9",
 "runtimes": {
 "dotnet": [
 "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
 "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
 ],
 "aspnetcore": [
 "$(MicrosoftAspNetCoreAppRefPackageVersion)"
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <Nullable>enable</Nullable>
 <StrongNameKeyId>Open</StrongNameKeyId>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

1 change: 1 addition & 0 deletions
src/Assets/WasmOverride/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
<Project />

4 changes: 4 additions & 0 deletions
src/Assets/WasmOverride/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
<Project>
 <!-- Overriding only when workload is installed, and targeting net8.0 -->
 <Import Project="WasmOverridePacks.targets" Condition="'$(WasmNativeWorkload)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '8.0'))" />
</Project>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[main] Update dotnet/runtime by lewing · Pull Request #35048 · dotnet/sdk · GitHub
Skip to content
[main] Update dotnet/runtime#35048

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

marcpopMSFT
merged 32 commits into

from

Sep 20, 2023
 Merged


[main] Update dotnet/runtime
#35048
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


32 commits


Select commit
Hold shift + click to select a range
5a7e1f2

[main] Update dotnet/runtime


lewing Aug 30, 2023
ac96fe8

Fix SharedFramework too


lewing Aug 30, 2023
09e6547

Update the variable used in global.json too


lewing Aug 30, 2023
8bed3cf

Update global.json

Aug 31, 2023
98927b2

Update blazor web tag

Aug 31, 2023
ab87475

Update blazor web tag for osx and linux

Sep 1, 2023
ef8f565

Update global.json


lewing Sep 1, 2023
f8f8fc2

Bump runtime dependencies


lewing Sep 2, 2023
4e46d4a

Bump tools packages to net8


agocke Sep 5, 2023
c6361e1

Suppress TFM build warnings temporarily


agocke Sep 5, 2023
e4063cf

Update to more recent runtime build


lewing Sep 5, 2023
3cc46c9

Update Directory.Build.props


lewing Sep 5, 2023
4593590

revert net9.0 target


lewing Sep 6, 2023
54e2592

Bump XUnitRunner TFM


nagilson Sep 6, 2023
bb4134f

Disable transitive pinning as there are conflicts in SRM which we can…


marcpopMSFT Sep 7, 2023
01a01e5

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 8, 2023
38e3276

Reenable transitive pinning and apply a fix to the package that was c…


marcpopMSFT Sep 8, 2023
71cc422

Switch a test to be self-contained. Not sure why this particular test…


marcpopMSFT Sep 8, 2023
90ee7e0

Ran update-test-baselines.ps1


marcpopMSFT Sep 9, 2023
3cd48fd

Target a test to be self-contained


marcpopMSFT Sep 13, 2023
0bdd9e7

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 13, 2023
42f534a

don't overwrite bundledversions unless the SemVer major values match


baronfel Sep 13, 2023
f8ef959

Add an additional dependency that's flagged in the tests.


marcpopMSFT Sep 13, 2023
a1ee049

Remove the cryptography reference per PR feedback


marcpopMSFT Sep 13, 2023
4ecccd1

Bump runtime build


lewing Sep 15, 2023
882db45

Fix blazor tests built with workloads


radical Sep 15, 2023
ef678de

Use WasmOverride.targets only for net8.0 wasm projects


radical Sep 15, 2023
ab71881

Merge branch 'main' into update-emsdk-manifest


marek-safar Sep 18, 2023
ce306be

Fix native aot lib test scenario


LakshanF Sep 18, 2023
d1f1784

Update versions to official RC1


mthalman Sep 19, 2023
ca8ddf9

Remove Microsoft.NETCore.DotNetHostResolver dependency


elinor-fung Sep 19, 2023
26162bd

Update SourceBuildPrebuiltBaseline.xml for 8.0 msbuild dependencies


marcpopMSFT Sep 19, 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


6 changes: 4 additions & 2 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@
 <IncludeSymbols>true</IncludeSymbols>
 <IsShippingPackage>false</IsShippingPackage>
 <SdkTargetFramework>net8.0</SdkTargetFramework>
 <!-- Temporarily disable build warnings while upgrading to the net9.0 TFM -->
 <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>

Comment on lines

+15
 to 
+16

@ViktorHoferViktorHoferSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Why is that needed? That switch isn't intended to be set by our own repositories. It's a last effort escape switch.
@marcpopMSFTmarcpopMSFTSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The build was throwing a massive number of errors about incompatible runtime targeting. In prior years, we have not had to retarget the SDK before merging in a new runtime so this seems to be a new error:
https://dev.azure.com/dnceng-public/public/_build/results?buildId=393849&view=logs&j=fa59fe4e-195c-56fa-189b-58fd241f10dd&t=e0ea3df6-0956-547c-f7b9-9062676d48ed
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

So adding that flag was to suppress the error so we could get runtime merged and then retarget later (last year, retargetting happened ~3 months after rebranding)
@ViktorHoferViktorHoferSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

dotnet/runtime retargeting happen soon after rebranding this year while that happened around December last year. That's probably the reason why you weren't impacted by this.
IMO it makes sense to do the retargeting here as part of consuming the new runtime. IIRC that's what we did in the previous releases, before .NET 7. But if this switch is just here for a few weeks, I'm fine with that.
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

ahh, I didn't realize runtime was that late last time around. That explains it. I'd like to take this whatever the shortest path to fixing the failures is
 <ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>

 <!-- VS for Mac may run on a lower version of .NET than the SDK is targeting, but needs to load the resolvers. So the resolvers and dependencies
 may target a lower version of .NET -->
 <ResolverTargetFramework>net7.0</ResolverTargetFramework>
 <ResolverTargetFramework>net8.0</ResolverTargetFramework>
 <!-- Source build does not need to worry about running on VS for Mac -->
 <ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>

Expand Down

5 changes: 5 additions & 0 deletions
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,10 @@
 <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />

 <!-- msbuild is still on 8.0 versions of these so we have to pin in SDK main for now or tasks will fail -->
 <UsagePattern IdentityGlob="Microsoft.NET.HostModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/*8.0.0*" />
 </IgnorePatterns>
</UsageData>

72 changes: 34 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,46 +14,42 @@
 <Sha>9dfddc30a1e9101f7e44dcda57d95902073e444c</Sha>
 <SourceBuild RepoName="templating" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 <SourceBuild RepoName="runtime" ManagedOnly="false" />
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23411.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-alpha.1.23457.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Uri>https://github.com/dotnet/emsdk</Uri>
 <Sha>abfa03c97f4175d4d209435cd0e71f558e36c3fd</Sha>
 <Sha>7da45c33d57a762de5756f2c090e84327dae143f</Sha>
 <SourceBuild RepoName="emsdk" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.Build" Version="17.8.0-preview-23462-02">
Expand DownExpand Up@@ -197,25 +193,25 @@
 <Uri>https://github.com/microsoft/vstest</Uri>
 <Sha>bb99e3ea07aaecd62d5c59568524133317d081b4</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.CodeDom" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.CodeDom" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Resources.Extensions" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Resources.Extensions" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-alpha.1.23456.3">
 <Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand DownExpand Up@@ -390,19 +386,19 @@
 <SourceBuild RepoName="symreader" ManagedOnly="true" />
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
Expand All@@ -423,9 +419,9 @@
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
 </Dependency>
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down

37 changes: 18 additions & 19 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,31 +35,30 @@
 <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
 <MicrosoftDotNetSignToolVersion>8.0.0-beta.23463.1</MicrosoftDotNetSignToolVersion>
 <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-rc.1.23421.3</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-alpha.1.23464.19</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
 <SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
 <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
 <SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
 <SystemReflectionMetadataLoadContextVersion>8.0.0-rc.1.23421.3</SystemReflectionMetadataLoadContextVersion>
 <SystemReflectionMetadataLoadContextVersion>9.0.0-alpha.1.23464.19</SystemReflectionMetadataLoadContextVersion>
 <SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
 <SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
 <MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23463.1</MicrosoftDeploymentDotNetReleasesVersion>
 <MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23421.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23464.19</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
 <MicrosoftNETHostModelVersion>8.0.0-rc.1.23421.3</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETHostModelVersion>9.0.0-alpha.1.23464.19</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>8.0.0-rc.1.23421.3</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>9.0.0-alpha.1.23464.19</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingPackageVersion>
 <MicrosoftExtensionsLoggingAbstractionsPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
 </PropertyGroup>
Expand DownExpand Up@@ -88,9 +87,9 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <SystemCodeDomPackageVersion>8.0.0-rc.1.23421.3</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>8.0.0-rc.1.23421.3</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>8.0.0-rc.1.23421.3</SystemResourcesExtensionsPackageVersion>
 <SystemCodeDomPackageVersion>9.0.0-alpha.1.23464.19</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>9.0.0-alpha.1.23464.19</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>9.0.0-alpha.1.23464.19</SystemResourcesExtensionsPackageVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/format -->
Expand DownExpand Up@@ -208,13 +207,13 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Workloads from dotnet/emsdk -->
 <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-rc.1.23411.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-alpha.1.23457.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <!-- emsdk workload prerelease version band must match the emsdk feature band -->
 <EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->
 <MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
 <!-- mono workload prerelease version band must match the runtime feature band -->
 <MonoWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 <MonoWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 </PropertyGroup>
</Project>

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3",
 "dotnet": "9.0.100-alpha.1.23421.9",
 "runtimes": {
 "dotnet": [
 "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
 "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
 ],
 "aspnetcore": [
 "$(MicrosoftAspNetCoreAppRefPackageVersion)"
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <Nullable>enable</Nullable>
 <StrongNameKeyId>Open</StrongNameKeyId>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

1 change: 1 addition & 0 deletions
src/Assets/WasmOverride/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
<Project />

4 changes: 4 additions & 0 deletions
src/Assets/WasmOverride/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
<Project>
 <!-- Overriding only when workload is installed, and targeting net8.0 -->
 <Import Project="WasmOverridePacks.targets" Condition="'$(WasmNativeWorkload)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '8.0'))" />
</Project>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[main] Update dotnet/runtime by lewing · Pull Request #35048 · dotnet/sdk · GitHub
Skip to content
[main] Update dotnet/runtime#35048

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

marcpopMSFT
merged 32 commits into

from

Sep 20, 2023
 Merged


[main] Update dotnet/runtime
#35048
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


32 commits


Select commit
Hold shift + click to select a range
5a7e1f2

[main] Update dotnet/runtime


lewing Aug 30, 2023
ac96fe8

Fix SharedFramework too


lewing Aug 30, 2023
09e6547

Update the variable used in global.json too


lewing Aug 30, 2023
8bed3cf

Update global.json

Aug 31, 2023
98927b2

Update blazor web tag

Aug 31, 2023
ab87475

Update blazor web tag for osx and linux

Sep 1, 2023
ef8f565

Update global.json


lewing Sep 1, 2023
f8f8fc2

Bump runtime dependencies


lewing Sep 2, 2023
4e46d4a

Bump tools packages to net8


agocke Sep 5, 2023
c6361e1

Suppress TFM build warnings temporarily


agocke Sep 5, 2023
e4063cf

Update to more recent runtime build


lewing Sep 5, 2023
3cc46c9

Update Directory.Build.props


lewing Sep 5, 2023
4593590

revert net9.0 target


lewing Sep 6, 2023
54e2592

Bump XUnitRunner TFM


nagilson Sep 6, 2023
bb4134f

Disable transitive pinning as there are conflicts in SRM which we can…


marcpopMSFT Sep 7, 2023
01a01e5

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 8, 2023
38e3276

Reenable transitive pinning and apply a fix to the package that was c…


marcpopMSFT Sep 8, 2023
71cc422

Switch a test to be self-contained. Not sure why this particular test…


marcpopMSFT Sep 8, 2023
90ee7e0

Ran update-test-baselines.ps1


marcpopMSFT Sep 9, 2023
3cd48fd

Target a test to be self-contained


marcpopMSFT Sep 13, 2023
0bdd9e7

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 13, 2023
42f534a

don't overwrite bundledversions unless the SemVer major values match


baronfel Sep 13, 2023
f8ef959

Add an additional dependency that's flagged in the tests.


marcpopMSFT Sep 13, 2023
a1ee049

Remove the cryptography reference per PR feedback


marcpopMSFT Sep 13, 2023
4ecccd1

Bump runtime build


lewing Sep 15, 2023
882db45

Fix blazor tests built with workloads


radical Sep 15, 2023
ef678de

Use WasmOverride.targets only for net8.0 wasm projects


radical Sep 15, 2023
ab71881

Merge branch 'main' into update-emsdk-manifest


marek-safar Sep 18, 2023
ce306be

Fix native aot lib test scenario


LakshanF Sep 18, 2023
d1f1784

Update versions to official RC1


mthalman Sep 19, 2023
ca8ddf9

Remove Microsoft.NETCore.DotNetHostResolver dependency


elinor-fung Sep 19, 2023
26162bd

Update SourceBuildPrebuiltBaseline.xml for 8.0 msbuild dependencies


marcpopMSFT Sep 19, 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


6 changes: 4 additions & 2 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@
 <IncludeSymbols>true</IncludeSymbols>
 <IsShippingPackage>false</IsShippingPackage>
 <SdkTargetFramework>net8.0</SdkTargetFramework>
 <!-- Temporarily disable build warnings while upgrading to the net9.0 TFM -->
 <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>

Comment on lines

+15
 to 
+16

@ViktorHoferViktorHoferSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Why is that needed? That switch isn't intended to be set by our own repositories. It's a last effort escape switch.
@marcpopMSFTmarcpopMSFTSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The build was throwing a massive number of errors about incompatible runtime targeting. In prior years, we have not had to retarget the SDK before merging in a new runtime so this seems to be a new error:
https://dev.azure.com/dnceng-public/public/_build/results?buildId=393849&view=logs&j=fa59fe4e-195c-56fa-189b-58fd241f10dd&t=e0ea3df6-0956-547c-f7b9-9062676d48ed
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

So adding that flag was to suppress the error so we could get runtime merged and then retarget later (last year, retargetting happened ~3 months after rebranding)
@ViktorHoferViktorHoferSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

dotnet/runtime retargeting happen soon after rebranding this year while that happened around December last year. That's probably the reason why you weren't impacted by this.
IMO it makes sense to do the retargeting here as part of consuming the new runtime. IIRC that's what we did in the previous releases, before .NET 7. But if this switch is just here for a few weeks, I'm fine with that.
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

ahh, I didn't realize runtime was that late last time around. That explains it. I'd like to take this whatever the shortest path to fixing the failures is
 <ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>

 <!-- VS for Mac may run on a lower version of .NET than the SDK is targeting, but needs to load the resolvers. So the resolvers and dependencies
 may target a lower version of .NET -->
 <ResolverTargetFramework>net7.0</ResolverTargetFramework>
 <ResolverTargetFramework>net8.0</ResolverTargetFramework>
 <!-- Source build does not need to worry about running on VS for Mac -->
 <ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>

Expand Down

5 changes: 5 additions & 0 deletions
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,10 @@
 <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />

 <!-- msbuild is still on 8.0 versions of these so we have to pin in SDK main for now or tasks will fail -->
 <UsagePattern IdentityGlob="Microsoft.NET.HostModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/*8.0.0*" />
 </IgnorePatterns>
</UsageData>

72 changes: 34 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,46 +14,42 @@
 <Sha>9dfddc30a1e9101f7e44dcda57d95902073e444c</Sha>
 <SourceBuild RepoName="templating" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 <SourceBuild RepoName="runtime" ManagedOnly="false" />
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23411.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-alpha.1.23457.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Uri>https://github.com/dotnet/emsdk</Uri>
 <Sha>abfa03c97f4175d4d209435cd0e71f558e36c3fd</Sha>
 <Sha>7da45c33d57a762de5756f2c090e84327dae143f</Sha>
 <SourceBuild RepoName="emsdk" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.Build" Version="17.8.0-preview-23462-02">
Expand DownExpand Up@@ -197,25 +193,25 @@
 <Uri>https://github.com/microsoft/vstest</Uri>
 <Sha>bb99e3ea07aaecd62d5c59568524133317d081b4</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.CodeDom" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.CodeDom" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Resources.Extensions" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Resources.Extensions" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-alpha.1.23456.3">
 <Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand DownExpand Up@@ -390,19 +386,19 @@
 <SourceBuild RepoName="symreader" ManagedOnly="true" />
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
Expand All@@ -423,9 +419,9 @@
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
 </Dependency>
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down

37 changes: 18 additions & 19 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,31 +35,30 @@
 <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
 <MicrosoftDotNetSignToolVersion>8.0.0-beta.23463.1</MicrosoftDotNetSignToolVersion>
 <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-rc.1.23421.3</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-alpha.1.23464.19</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
 <SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
 <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
 <SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
 <SystemReflectionMetadataLoadContextVersion>8.0.0-rc.1.23421.3</SystemReflectionMetadataLoadContextVersion>
 <SystemReflectionMetadataLoadContextVersion>9.0.0-alpha.1.23464.19</SystemReflectionMetadataLoadContextVersion>
 <SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
 <SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
 <MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23463.1</MicrosoftDeploymentDotNetReleasesVersion>
 <MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23421.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23464.19</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
 <MicrosoftNETHostModelVersion>8.0.0-rc.1.23421.3</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETHostModelVersion>9.0.0-alpha.1.23464.19</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>8.0.0-rc.1.23421.3</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>9.0.0-alpha.1.23464.19</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingPackageVersion>
 <MicrosoftExtensionsLoggingAbstractionsPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
 </PropertyGroup>
Expand DownExpand Up@@ -88,9 +87,9 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <SystemCodeDomPackageVersion>8.0.0-rc.1.23421.3</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>8.0.0-rc.1.23421.3</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>8.0.0-rc.1.23421.3</SystemResourcesExtensionsPackageVersion>
 <SystemCodeDomPackageVersion>9.0.0-alpha.1.23464.19</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>9.0.0-alpha.1.23464.19</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>9.0.0-alpha.1.23464.19</SystemResourcesExtensionsPackageVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/format -->
Expand DownExpand Up@@ -208,13 +207,13 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Workloads from dotnet/emsdk -->
 <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-rc.1.23411.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-alpha.1.23457.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <!-- emsdk workload prerelease version band must match the emsdk feature band -->
 <EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->
 <MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
 <!-- mono workload prerelease version band must match the runtime feature band -->
 <MonoWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 <MonoWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 </PropertyGroup>
</Project>

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3",
 "dotnet": "9.0.100-alpha.1.23421.9",
 "runtimes": {
 "dotnet": [
 "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
 "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
 ],
 "aspnetcore": [
 "$(MicrosoftAspNetCoreAppRefPackageVersion)"
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <Nullable>enable</Nullable>
 <StrongNameKeyId>Open</StrongNameKeyId>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

1 change: 1 addition & 0 deletions
src/Assets/WasmOverride/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
<Project />

4 changes: 4 additions & 0 deletions
src/Assets/WasmOverride/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
<Project>
 <!-- Overriding only when workload is installed, and targeting net8.0 -->
 <Import Project="WasmOverridePacks.targets" Condition="'$(WasmNativeWorkload)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '8.0'))" />
</Project>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[main] Update dotnet/runtime by lewing · Pull Request #35048 · dotnet/sdk · GitHub
Skip to content
[main] Update dotnet/runtime#35048

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

marcpopMSFT
merged 32 commits into

from

Sep 20, 2023
 Merged


[main] Update dotnet/runtime
#35048
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


32 commits


Select commit
Hold shift + click to select a range
5a7e1f2

[main] Update dotnet/runtime


lewing Aug 30, 2023
ac96fe8

Fix SharedFramework too


lewing Aug 30, 2023
09e6547

Update the variable used in global.json too


lewing Aug 30, 2023
8bed3cf

Update global.json

Aug 31, 2023
98927b2

Update blazor web tag

Aug 31, 2023
ab87475

Update blazor web tag for osx and linux

Sep 1, 2023
ef8f565

Update global.json


lewing Sep 1, 2023
f8f8fc2

Bump runtime dependencies


lewing Sep 2, 2023
4e46d4a

Bump tools packages to net8


agocke Sep 5, 2023
c6361e1

Suppress TFM build warnings temporarily


agocke Sep 5, 2023
e4063cf

Update to more recent runtime build


lewing Sep 5, 2023
3cc46c9

Update Directory.Build.props


lewing Sep 5, 2023
4593590

revert net9.0 target


lewing Sep 6, 2023
54e2592

Bump XUnitRunner TFM


nagilson Sep 6, 2023
bb4134f

Disable transitive pinning as there are conflicts in SRM which we can…


marcpopMSFT Sep 7, 2023
01a01e5

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 8, 2023
38e3276

Reenable transitive pinning and apply a fix to the package that was c…


marcpopMSFT Sep 8, 2023
71cc422

Switch a test to be self-contained. Not sure why this particular test…


marcpopMSFT Sep 8, 2023
90ee7e0

Ran update-test-baselines.ps1


marcpopMSFT Sep 9, 2023
3cd48fd

Target a test to be self-contained


marcpopMSFT Sep 13, 2023
0bdd9e7

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 13, 2023
42f534a

don't overwrite bundledversions unless the SemVer major values match


baronfel Sep 13, 2023
f8ef959

Add an additional dependency that's flagged in the tests.


marcpopMSFT Sep 13, 2023
a1ee049

Remove the cryptography reference per PR feedback


marcpopMSFT Sep 13, 2023
4ecccd1

Bump runtime build


lewing Sep 15, 2023
882db45

Fix blazor tests built with workloads


radical Sep 15, 2023
ef678de

Use WasmOverride.targets only for net8.0 wasm projects


radical Sep 15, 2023
ab71881

Merge branch 'main' into update-emsdk-manifest


marek-safar Sep 18, 2023
ce306be

Fix native aot lib test scenario


LakshanF Sep 18, 2023
d1f1784

Update versions to official RC1


mthalman Sep 19, 2023
ca8ddf9

Remove Microsoft.NETCore.DotNetHostResolver dependency


elinor-fung Sep 19, 2023
26162bd

Update SourceBuildPrebuiltBaseline.xml for 8.0 msbuild dependencies


marcpopMSFT Sep 19, 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


6 changes: 4 additions & 2 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@
 <IncludeSymbols>true</IncludeSymbols>
 <IsShippingPackage>false</IsShippingPackage>
 <SdkTargetFramework>net8.0</SdkTargetFramework>
 <!-- Temporarily disable build warnings while upgrading to the net9.0 TFM -->
 <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>

Comment on lines

+15
 to 
+16

@ViktorHoferViktorHoferSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Why is that needed? That switch isn't intended to be set by our own repositories. It's a last effort escape switch.
@marcpopMSFTmarcpopMSFTSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The build was throwing a massive number of errors about incompatible runtime targeting. In prior years, we have not had to retarget the SDK before merging in a new runtime so this seems to be a new error:
https://dev.azure.com/dnceng-public/public/_build/results?buildId=393849&view=logs&j=fa59fe4e-195c-56fa-189b-58fd241f10dd&t=e0ea3df6-0956-547c-f7b9-9062676d48ed
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

So adding that flag was to suppress the error so we could get runtime merged and then retarget later (last year, retargetting happened ~3 months after rebranding)
@ViktorHoferViktorHoferSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

dotnet/runtime retargeting happen soon after rebranding this year while that happened around December last year. That's probably the reason why you weren't impacted by this.
IMO it makes sense to do the retargeting here as part of consuming the new runtime. IIRC that's what we did in the previous releases, before .NET 7. But if this switch is just here for a few weeks, I'm fine with that.
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

ahh, I didn't realize runtime was that late last time around. That explains it. I'd like to take this whatever the shortest path to fixing the failures is
 <ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>

 <!-- VS for Mac may run on a lower version of .NET than the SDK is targeting, but needs to load the resolvers. So the resolvers and dependencies
 may target a lower version of .NET -->
 <ResolverTargetFramework>net7.0</ResolverTargetFramework>
 <ResolverTargetFramework>net8.0</ResolverTargetFramework>
 <!-- Source build does not need to worry about running on VS for Mac -->
 <ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>

Expand Down

5 changes: 5 additions & 0 deletions
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,10 @@
 <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />

 <!-- msbuild is still on 8.0 versions of these so we have to pin in SDK main for now or tasks will fail -->
 <UsagePattern IdentityGlob="Microsoft.NET.HostModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/*8.0.0*" />
 </IgnorePatterns>
</UsageData>

72 changes: 34 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,46 +14,42 @@
 <Sha>9dfddc30a1e9101f7e44dcda57d95902073e444c</Sha>
 <SourceBuild RepoName="templating" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 <SourceBuild RepoName="runtime" ManagedOnly="false" />
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23411.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-alpha.1.23457.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Uri>https://github.com/dotnet/emsdk</Uri>
 <Sha>abfa03c97f4175d4d209435cd0e71f558e36c3fd</Sha>
 <Sha>7da45c33d57a762de5756f2c090e84327dae143f</Sha>
 <SourceBuild RepoName="emsdk" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.Build" Version="17.8.0-preview-23462-02">
Expand DownExpand Up@@ -197,25 +193,25 @@
 <Uri>https://github.com/microsoft/vstest</Uri>
 <Sha>bb99e3ea07aaecd62d5c59568524133317d081b4</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.CodeDom" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.CodeDom" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Resources.Extensions" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Resources.Extensions" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-alpha.1.23456.3">
 <Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand DownExpand Up@@ -390,19 +386,19 @@
 <SourceBuild RepoName="symreader" ManagedOnly="true" />
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
Expand All@@ -423,9 +419,9 @@
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
 </Dependency>
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down

37 changes: 18 additions & 19 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,31 +35,30 @@
 <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
 <MicrosoftDotNetSignToolVersion>8.0.0-beta.23463.1</MicrosoftDotNetSignToolVersion>
 <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-rc.1.23421.3</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-alpha.1.23464.19</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
 <SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
 <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
 <SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
 <SystemReflectionMetadataLoadContextVersion>8.0.0-rc.1.23421.3</SystemReflectionMetadataLoadContextVersion>
 <SystemReflectionMetadataLoadContextVersion>9.0.0-alpha.1.23464.19</SystemReflectionMetadataLoadContextVersion>
 <SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
 <SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
 <MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23463.1</MicrosoftDeploymentDotNetReleasesVersion>
 <MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23421.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23464.19</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
 <MicrosoftNETHostModelVersion>8.0.0-rc.1.23421.3</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETHostModelVersion>9.0.0-alpha.1.23464.19</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>8.0.0-rc.1.23421.3</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>9.0.0-alpha.1.23464.19</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingPackageVersion>
 <MicrosoftExtensionsLoggingAbstractionsPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
 </PropertyGroup>
Expand DownExpand Up@@ -88,9 +87,9 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <SystemCodeDomPackageVersion>8.0.0-rc.1.23421.3</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>8.0.0-rc.1.23421.3</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>8.0.0-rc.1.23421.3</SystemResourcesExtensionsPackageVersion>
 <SystemCodeDomPackageVersion>9.0.0-alpha.1.23464.19</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>9.0.0-alpha.1.23464.19</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>9.0.0-alpha.1.23464.19</SystemResourcesExtensionsPackageVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/format -->
Expand DownExpand Up@@ -208,13 +207,13 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Workloads from dotnet/emsdk -->
 <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-rc.1.23411.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-alpha.1.23457.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <!-- emsdk workload prerelease version band must match the emsdk feature band -->
 <EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->
 <MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
 <!-- mono workload prerelease version band must match the runtime feature band -->
 <MonoWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 <MonoWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 </PropertyGroup>
</Project>

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3",
 "dotnet": "9.0.100-alpha.1.23421.9",
 "runtimes": {
 "dotnet": [
 "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
 "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
 ],
 "aspnetcore": [
 "$(MicrosoftAspNetCoreAppRefPackageVersion)"
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <Nullable>enable</Nullable>
 <StrongNameKeyId>Open</StrongNameKeyId>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

1 change: 1 addition & 0 deletions
src/Assets/WasmOverride/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
<Project />

4 changes: 4 additions & 0 deletions
src/Assets/WasmOverride/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
<Project>
 <!-- Overriding only when workload is installed, and targeting net8.0 -->
 <Import Project="WasmOverridePacks.targets" Condition="'$(WasmNativeWorkload)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '8.0'))" />
</Project>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[main] Update dotnet/runtime by lewing · Pull Request #35048 · dotnet/sdk · GitHub
Skip to content
[main] Update dotnet/runtime#35048

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

marcpopMSFT
merged 32 commits into

from

Sep 20, 2023
 Merged


[main] Update dotnet/runtime
#35048
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


32 commits


Select commit
Hold shift + click to select a range
5a7e1f2

[main] Update dotnet/runtime


lewing Aug 30, 2023
ac96fe8

Fix SharedFramework too


lewing Aug 30, 2023
09e6547

Update the variable used in global.json too


lewing Aug 30, 2023
8bed3cf

Update global.json

Aug 31, 2023
98927b2

Update blazor web tag

Aug 31, 2023
ab87475

Update blazor web tag for osx and linux

Sep 1, 2023
ef8f565

Update global.json


lewing Sep 1, 2023
f8f8fc2

Bump runtime dependencies


lewing Sep 2, 2023
4e46d4a

Bump tools packages to net8


agocke Sep 5, 2023
c6361e1

Suppress TFM build warnings temporarily


agocke Sep 5, 2023
e4063cf

Update to more recent runtime build


lewing Sep 5, 2023
3cc46c9

Update Directory.Build.props


lewing Sep 5, 2023
4593590

revert net9.0 target


lewing Sep 6, 2023
54e2592

Bump XUnitRunner TFM


nagilson Sep 6, 2023
bb4134f

Disable transitive pinning as there are conflicts in SRM which we can…


marcpopMSFT Sep 7, 2023
01a01e5

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 8, 2023
38e3276

Reenable transitive pinning and apply a fix to the package that was c…


marcpopMSFT Sep 8, 2023
71cc422

Switch a test to be self-contained. Not sure why this particular test…


marcpopMSFT Sep 8, 2023
90ee7e0

Ran update-test-baselines.ps1


marcpopMSFT Sep 9, 2023
3cd48fd

Target a test to be self-contained


marcpopMSFT Sep 13, 2023
0bdd9e7

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 13, 2023
42f534a

don't overwrite bundledversions unless the SemVer major values match


baronfel Sep 13, 2023
f8ef959

Add an additional dependency that's flagged in the tests.


marcpopMSFT Sep 13, 2023
a1ee049

Remove the cryptography reference per PR feedback


marcpopMSFT Sep 13, 2023
4ecccd1

Bump runtime build


lewing Sep 15, 2023
882db45

Fix blazor tests built with workloads


radical Sep 15, 2023
ef678de

Use WasmOverride.targets only for net8.0 wasm projects


radical Sep 15, 2023
ab71881

Merge branch 'main' into update-emsdk-manifest


marek-safar Sep 18, 2023
ce306be

Fix native aot lib test scenario


LakshanF Sep 18, 2023
d1f1784

Update versions to official RC1


mthalman Sep 19, 2023
ca8ddf9

Remove Microsoft.NETCore.DotNetHostResolver dependency


elinor-fung Sep 19, 2023
26162bd

Update SourceBuildPrebuiltBaseline.xml for 8.0 msbuild dependencies


marcpopMSFT Sep 19, 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


6 changes: 4 additions & 2 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@
 <IncludeSymbols>true</IncludeSymbols>
 <IsShippingPackage>false</IsShippingPackage>
 <SdkTargetFramework>net8.0</SdkTargetFramework>
 <!-- Temporarily disable build warnings while upgrading to the net9.0 TFM -->
 <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>

Comment on lines

+15
 to 
+16

@ViktorHoferViktorHoferSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Why is that needed? That switch isn't intended to be set by our own repositories. It's a last effort escape switch.
@marcpopMSFTmarcpopMSFTSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The build was throwing a massive number of errors about incompatible runtime targeting. In prior years, we have not had to retarget the SDK before merging in a new runtime so this seems to be a new error:
https://dev.azure.com/dnceng-public/public/_build/results?buildId=393849&view=logs&j=fa59fe4e-195c-56fa-189b-58fd241f10dd&t=e0ea3df6-0956-547c-f7b9-9062676d48ed
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

So adding that flag was to suppress the error so we could get runtime merged and then retarget later (last year, retargetting happened ~3 months after rebranding)
@ViktorHoferViktorHoferSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

dotnet/runtime retargeting happen soon after rebranding this year while that happened around December last year. That's probably the reason why you weren't impacted by this.
IMO it makes sense to do the retargeting here as part of consuming the new runtime. IIRC that's what we did in the previous releases, before .NET 7. But if this switch is just here for a few weeks, I'm fine with that.
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

ahh, I didn't realize runtime was that late last time around. That explains it. I'd like to take this whatever the shortest path to fixing the failures is
 <ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>

 <!-- VS for Mac may run on a lower version of .NET than the SDK is targeting, but needs to load the resolvers. So the resolvers and dependencies
 may target a lower version of .NET -->
 <ResolverTargetFramework>net7.0</ResolverTargetFramework>
 <ResolverTargetFramework>net8.0</ResolverTargetFramework>
 <!-- Source build does not need to worry about running on VS for Mac -->
 <ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>

Expand Down

5 changes: 5 additions & 0 deletions
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,10 @@
 <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />

 <!-- msbuild is still on 8.0 versions of these so we have to pin in SDK main for now or tasks will fail -->
 <UsagePattern IdentityGlob="Microsoft.NET.HostModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/*8.0.0*" />
 </IgnorePatterns>
</UsageData>

72 changes: 34 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,46 +14,42 @@
 <Sha>9dfddc30a1e9101f7e44dcda57d95902073e444c</Sha>
 <SourceBuild RepoName="templating" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 <SourceBuild RepoName="runtime" ManagedOnly="false" />
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23411.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-alpha.1.23457.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Uri>https://github.com/dotnet/emsdk</Uri>
 <Sha>abfa03c97f4175d4d209435cd0e71f558e36c3fd</Sha>
 <Sha>7da45c33d57a762de5756f2c090e84327dae143f</Sha>
 <SourceBuild RepoName="emsdk" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.Build" Version="17.8.0-preview-23462-02">
Expand DownExpand Up@@ -197,25 +193,25 @@
 <Uri>https://github.com/microsoft/vstest</Uri>
 <Sha>bb99e3ea07aaecd62d5c59568524133317d081b4</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.CodeDom" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.CodeDom" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Resources.Extensions" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Resources.Extensions" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-alpha.1.23456.3">
 <Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand DownExpand Up@@ -390,19 +386,19 @@
 <SourceBuild RepoName="symreader" ManagedOnly="true" />
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
Expand All@@ -423,9 +419,9 @@
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
 </Dependency>
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down

37 changes: 18 additions & 19 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,31 +35,30 @@
 <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
 <MicrosoftDotNetSignToolVersion>8.0.0-beta.23463.1</MicrosoftDotNetSignToolVersion>
 <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-rc.1.23421.3</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-alpha.1.23464.19</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
 <SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
 <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
 <SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
 <SystemReflectionMetadataLoadContextVersion>8.0.0-rc.1.23421.3</SystemReflectionMetadataLoadContextVersion>
 <SystemReflectionMetadataLoadContextVersion>9.0.0-alpha.1.23464.19</SystemReflectionMetadataLoadContextVersion>
 <SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
 <SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
 <MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23463.1</MicrosoftDeploymentDotNetReleasesVersion>
 <MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23421.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23464.19</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
 <MicrosoftNETHostModelVersion>8.0.0-rc.1.23421.3</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETHostModelVersion>9.0.0-alpha.1.23464.19</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>8.0.0-rc.1.23421.3</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>9.0.0-alpha.1.23464.19</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingPackageVersion>
 <MicrosoftExtensionsLoggingAbstractionsPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
 </PropertyGroup>
Expand DownExpand Up@@ -88,9 +87,9 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <SystemCodeDomPackageVersion>8.0.0-rc.1.23421.3</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>8.0.0-rc.1.23421.3</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>8.0.0-rc.1.23421.3</SystemResourcesExtensionsPackageVersion>
 <SystemCodeDomPackageVersion>9.0.0-alpha.1.23464.19</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>9.0.0-alpha.1.23464.19</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>9.0.0-alpha.1.23464.19</SystemResourcesExtensionsPackageVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/format -->
Expand DownExpand Up@@ -208,13 +207,13 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Workloads from dotnet/emsdk -->
 <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-rc.1.23411.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-alpha.1.23457.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <!-- emsdk workload prerelease version band must match the emsdk feature band -->
 <EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->
 <MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
 <!-- mono workload prerelease version band must match the runtime feature band -->
 <MonoWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 <MonoWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 </PropertyGroup>
</Project>

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3",
 "dotnet": "9.0.100-alpha.1.23421.9",
 "runtimes": {
 "dotnet": [
 "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
 "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
 ],
 "aspnetcore": [
 "$(MicrosoftAspNetCoreAppRefPackageVersion)"
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <Nullable>enable</Nullable>
 <StrongNameKeyId>Open</StrongNameKeyId>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

1 change: 1 addition & 0 deletions
src/Assets/WasmOverride/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
<Project />

4 changes: 4 additions & 0 deletions
src/Assets/WasmOverride/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
<Project>
 <!-- Overriding only when workload is installed, and targeting net8.0 -->
 <Import Project="WasmOverridePacks.targets" Condition="'$(WasmNativeWorkload)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '8.0'))" />
</Project>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[main] Update dotnet/runtime by lewing · Pull Request #35048 · dotnet/sdk · GitHub
Skip to content
[main] Update dotnet/runtime#35048

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

marcpopMSFT
merged 32 commits into

from

Sep 20, 2023
 Merged


[main] Update dotnet/runtime
#35048
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


32 commits


Select commit
Hold shift + click to select a range
5a7e1f2

[main] Update dotnet/runtime


lewing Aug 30, 2023
ac96fe8

Fix SharedFramework too


lewing Aug 30, 2023
09e6547

Update the variable used in global.json too


lewing Aug 30, 2023
8bed3cf

Update global.json

Aug 31, 2023
98927b2

Update blazor web tag

Aug 31, 2023
ab87475

Update blazor web tag for osx and linux

Sep 1, 2023
ef8f565

Update global.json


lewing Sep 1, 2023
f8f8fc2

Bump runtime dependencies


lewing Sep 2, 2023
4e46d4a

Bump tools packages to net8


agocke Sep 5, 2023
c6361e1

Suppress TFM build warnings temporarily


agocke Sep 5, 2023
e4063cf

Update to more recent runtime build


lewing Sep 5, 2023
3cc46c9

Update Directory.Build.props


lewing Sep 5, 2023
4593590

revert net9.0 target


lewing Sep 6, 2023
54e2592

Bump XUnitRunner TFM


nagilson Sep 6, 2023
bb4134f

Disable transitive pinning as there are conflicts in SRM which we can…


marcpopMSFT Sep 7, 2023
01a01e5

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 8, 2023
38e3276

Reenable transitive pinning and apply a fix to the package that was c…


marcpopMSFT Sep 8, 2023
71cc422

Switch a test to be self-contained. Not sure why this particular test…


marcpopMSFT Sep 8, 2023
90ee7e0

Ran update-test-baselines.ps1


marcpopMSFT Sep 9, 2023
3cd48fd

Target a test to be self-contained


marcpopMSFT Sep 13, 2023
0bdd9e7

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 13, 2023
42f534a

don't overwrite bundledversions unless the SemVer major values match


baronfel Sep 13, 2023
f8ef959

Add an additional dependency that's flagged in the tests.


marcpopMSFT Sep 13, 2023
a1ee049

Remove the cryptography reference per PR feedback


marcpopMSFT Sep 13, 2023
4ecccd1

Bump runtime build


lewing Sep 15, 2023
882db45

Fix blazor tests built with workloads


radical Sep 15, 2023
ef678de

Use WasmOverride.targets only for net8.0 wasm projects


radical Sep 15, 2023
ab71881

Merge branch 'main' into update-emsdk-manifest


marek-safar Sep 18, 2023
ce306be

Fix native aot lib test scenario


LakshanF Sep 18, 2023
d1f1784

Update versions to official RC1


mthalman Sep 19, 2023
ca8ddf9

Remove Microsoft.NETCore.DotNetHostResolver dependency


elinor-fung Sep 19, 2023
26162bd

Update SourceBuildPrebuiltBaseline.xml for 8.0 msbuild dependencies


marcpopMSFT Sep 19, 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


6 changes: 4 additions & 2 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@
 <IncludeSymbols>true</IncludeSymbols>
 <IsShippingPackage>false</IsShippingPackage>
 <SdkTargetFramework>net8.0</SdkTargetFramework>
 <!-- Temporarily disable build warnings while upgrading to the net9.0 TFM -->
 <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>

Comment on lines

+15
 to 
+16

@ViktorHoferViktorHoferSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Why is that needed? That switch isn't intended to be set by our own repositories. It's a last effort escape switch.
@marcpopMSFTmarcpopMSFTSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The build was throwing a massive number of errors about incompatible runtime targeting. In prior years, we have not had to retarget the SDK before merging in a new runtime so this seems to be a new error:
https://dev.azure.com/dnceng-public/public/_build/results?buildId=393849&view=logs&j=fa59fe4e-195c-56fa-189b-58fd241f10dd&t=e0ea3df6-0956-547c-f7b9-9062676d48ed
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

So adding that flag was to suppress the error so we could get runtime merged and then retarget later (last year, retargetting happened ~3 months after rebranding)
@ViktorHoferViktorHoferSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

dotnet/runtime retargeting happen soon after rebranding this year while that happened around December last year. That's probably the reason why you weren't impacted by this.
IMO it makes sense to do the retargeting here as part of consuming the new runtime. IIRC that's what we did in the previous releases, before .NET 7. But if this switch is just here for a few weeks, I'm fine with that.
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

ahh, I didn't realize runtime was that late last time around. That explains it. I'd like to take this whatever the shortest path to fixing the failures is
 <ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>

 <!-- VS for Mac may run on a lower version of .NET than the SDK is targeting, but needs to load the resolvers. So the resolvers and dependencies
 may target a lower version of .NET -->
 <ResolverTargetFramework>net7.0</ResolverTargetFramework>
 <ResolverTargetFramework>net8.0</ResolverTargetFramework>
 <!-- Source build does not need to worry about running on VS for Mac -->
 <ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>

Expand Down

5 changes: 5 additions & 0 deletions
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,10 @@
 <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />

 <!-- msbuild is still on 8.0 versions of these so we have to pin in SDK main for now or tasks will fail -->
 <UsagePattern IdentityGlob="Microsoft.NET.HostModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/*8.0.0*" />
 </IgnorePatterns>
</UsageData>

72 changes: 34 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,46 +14,42 @@
 <Sha>9dfddc30a1e9101f7e44dcda57d95902073e444c</Sha>
 <SourceBuild RepoName="templating" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 <SourceBuild RepoName="runtime" ManagedOnly="false" />
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23411.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-alpha.1.23457.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Uri>https://github.com/dotnet/emsdk</Uri>
 <Sha>abfa03c97f4175d4d209435cd0e71f558e36c3fd</Sha>
 <Sha>7da45c33d57a762de5756f2c090e84327dae143f</Sha>
 <SourceBuild RepoName="emsdk" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.Build" Version="17.8.0-preview-23462-02">
Expand DownExpand Up@@ -197,25 +193,25 @@
 <Uri>https://github.com/microsoft/vstest</Uri>
 <Sha>bb99e3ea07aaecd62d5c59568524133317d081b4</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.CodeDom" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.CodeDom" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Resources.Extensions" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Resources.Extensions" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-alpha.1.23456.3">
 <Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand DownExpand Up@@ -390,19 +386,19 @@
 <SourceBuild RepoName="symreader" ManagedOnly="true" />
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
Expand All@@ -423,9 +419,9 @@
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
 </Dependency>
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down

37 changes: 18 additions & 19 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,31 +35,30 @@
 <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
 <MicrosoftDotNetSignToolVersion>8.0.0-beta.23463.1</MicrosoftDotNetSignToolVersion>
 <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-rc.1.23421.3</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-alpha.1.23464.19</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
 <SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
 <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
 <SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
 <SystemReflectionMetadataLoadContextVersion>8.0.0-rc.1.23421.3</SystemReflectionMetadataLoadContextVersion>
 <SystemReflectionMetadataLoadContextVersion>9.0.0-alpha.1.23464.19</SystemReflectionMetadataLoadContextVersion>
 <SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
 <SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
 <MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23463.1</MicrosoftDeploymentDotNetReleasesVersion>
 <MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23421.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23464.19</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
 <MicrosoftNETHostModelVersion>8.0.0-rc.1.23421.3</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETHostModelVersion>9.0.0-alpha.1.23464.19</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>8.0.0-rc.1.23421.3</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>9.0.0-alpha.1.23464.19</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingPackageVersion>
 <MicrosoftExtensionsLoggingAbstractionsPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
 </PropertyGroup>
Expand DownExpand Up@@ -88,9 +87,9 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <SystemCodeDomPackageVersion>8.0.0-rc.1.23421.3</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>8.0.0-rc.1.23421.3</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>8.0.0-rc.1.23421.3</SystemResourcesExtensionsPackageVersion>
 <SystemCodeDomPackageVersion>9.0.0-alpha.1.23464.19</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>9.0.0-alpha.1.23464.19</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>9.0.0-alpha.1.23464.19</SystemResourcesExtensionsPackageVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/format -->
Expand DownExpand Up@@ -208,13 +207,13 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Workloads from dotnet/emsdk -->
 <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-rc.1.23411.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-alpha.1.23457.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <!-- emsdk workload prerelease version band must match the emsdk feature band -->
 <EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->
 <MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
 <!-- mono workload prerelease version band must match the runtime feature band -->
 <MonoWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 <MonoWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 </PropertyGroup>
</Project>

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3",
 "dotnet": "9.0.100-alpha.1.23421.9",
 "runtimes": {
 "dotnet": [
 "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
 "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
 ],
 "aspnetcore": [
 "$(MicrosoftAspNetCoreAppRefPackageVersion)"
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <Nullable>enable</Nullable>
 <StrongNameKeyId>Open</StrongNameKeyId>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

1 change: 1 addition & 0 deletions
src/Assets/WasmOverride/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
<Project />

4 changes: 4 additions & 0 deletions
src/Assets/WasmOverride/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
<Project>
 <!-- Overriding only when workload is installed, and targeting net8.0 -->
 <Import Project="WasmOverridePacks.targets" Condition="'$(WasmNativeWorkload)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '8.0'))" />
</Project>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[main] Update dotnet/runtime by lewing · Pull Request #35048 · dotnet/sdk · GitHub
Skip to content
[main] Update dotnet/runtime#35048

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

marcpopMSFT
merged 32 commits into

from

Sep 20, 2023
 Merged


[main] Update dotnet/runtime
#35048
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


32 commits


Select commit
Hold shift + click to select a range
5a7e1f2

[main] Update dotnet/runtime


lewing Aug 30, 2023
ac96fe8

Fix SharedFramework too


lewing Aug 30, 2023
09e6547

Update the variable used in global.json too


lewing Aug 30, 2023
8bed3cf

Update global.json

Aug 31, 2023
98927b2

Update blazor web tag

Aug 31, 2023
ab87475

Update blazor web tag for osx and linux

Sep 1, 2023
ef8f565

Update global.json


lewing Sep 1, 2023
f8f8fc2

Bump runtime dependencies


lewing Sep 2, 2023
4e46d4a

Bump tools packages to net8


agocke Sep 5, 2023
c6361e1

Suppress TFM build warnings temporarily


agocke Sep 5, 2023
e4063cf

Update to more recent runtime build


lewing Sep 5, 2023
3cc46c9

Update Directory.Build.props


lewing Sep 5, 2023
4593590

revert net9.0 target


lewing Sep 6, 2023
54e2592

Bump XUnitRunner TFM


nagilson Sep 6, 2023
bb4134f

Disable transitive pinning as there are conflicts in SRM which we can…


marcpopMSFT Sep 7, 2023
01a01e5

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 8, 2023
38e3276

Reenable transitive pinning and apply a fix to the package that was c…


marcpopMSFT Sep 8, 2023
71cc422

Switch a test to be self-contained. Not sure why this particular test…


marcpopMSFT Sep 8, 2023
90ee7e0

Ran update-test-baselines.ps1


marcpopMSFT Sep 9, 2023
3cd48fd

Target a test to be self-contained


marcpopMSFT Sep 13, 2023
0bdd9e7

Merge remote-tracking branch 'origin/main' into update-emsdk-manifest


marcpopMSFT Sep 13, 2023
42f534a

don't overwrite bundledversions unless the SemVer major values match


baronfel Sep 13, 2023
f8ef959

Add an additional dependency that's flagged in the tests.


marcpopMSFT Sep 13, 2023
a1ee049

Remove the cryptography reference per PR feedback


marcpopMSFT Sep 13, 2023
4ecccd1

Bump runtime build


lewing Sep 15, 2023
882db45

Fix blazor tests built with workloads


radical Sep 15, 2023
ef678de

Use WasmOverride.targets only for net8.0 wasm projects


radical Sep 15, 2023
ab71881

Merge branch 'main' into update-emsdk-manifest


marek-safar Sep 18, 2023
ce306be

Fix native aot lib test scenario


LakshanF Sep 18, 2023
d1f1784

Update versions to official RC1


mthalman Sep 19, 2023
ca8ddf9

Remove Microsoft.NETCore.DotNetHostResolver dependency


elinor-fung Sep 19, 2023
26162bd

Update SourceBuildPrebuiltBaseline.xml for 8.0 msbuild dependencies


marcpopMSFT Sep 19, 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


6 changes: 4 additions & 2 deletions
Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,11 +12,13 @@
 <IncludeSymbols>true</IncludeSymbols>
 <IsShippingPackage>false</IsShippingPackage>
 <SdkTargetFramework>net8.0</SdkTargetFramework>
 <!-- Temporarily disable build warnings while upgrading to the net9.0 TFM -->
 <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>

Comment on lines

+15
 to 
+16

@ViktorHoferViktorHoferSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Why is that needed? That switch isn't intended to be set by our own repositories. It's a last effort escape switch.
@marcpopMSFTmarcpopMSFTSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

The build was throwing a massive number of errors about incompatible runtime targeting. In prior years, we have not had to retarget the SDK before merging in a new runtime so this seems to be a new error:
https://dev.azure.com/dnceng-public/public/_build/results?buildId=393849&view=logs&j=fa59fe4e-195c-56fa-189b-58fd241f10dd&t=e0ea3df6-0956-547c-f7b9-9062676d48ed
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

So adding that flag was to suppress the error so we could get runtime merged and then retarget later (last year, retargetting happened ~3 months after rebranding)
@ViktorHoferViktorHoferSep 7, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

dotnet/runtime retargeting happen soon after rebranding this year while that happened around December last year. That's probably the reason why you weren't impacted by this.
IMO it makes sense to do the retargeting here as part of consuming the new runtime. IIRC that's what we did in the previous releases, before .NET 7. But if this switch is just here for a few weeks, I'm fine with that.
@marcpopMSFTmarcpopMSFTSep 7, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

ahh, I didn't realize runtime was that late last time around. That explains it. I'd like to take this whatever the shortest path to fixing the failures is
 <ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>

 <!-- VS for Mac may run on a lower version of .NET than the SDK is targeting, but needs to load the resolvers. So the resolvers and dependencies
 may target a lower version of .NET -->
 <ResolverTargetFramework>net7.0</ResolverTargetFramework>
 <ResolverTargetFramework>net8.0</ResolverTargetFramework>
 <!-- Source build does not need to worry about running on VS for Mac -->
 <ResolverTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">$(SdkTargetFramework)</ResolverTargetFramework>

Expand Down

5 changes: 5 additions & 0 deletions
eng/SourceBuildPrebuiltBaseline.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,5 +32,10 @@
 <UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
 <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />

 <!-- msbuild is still on 8.0 versions of these so we have to pin in SDK main for now or tasks will fail -->
 <UsagePattern IdentityGlob="Microsoft.NET.HostModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Extensions.DependencyModel/*8.0.0*" />
 <UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/*8.0.0*" />
 </IgnorePatterns>
</UsageData>

72 changes: 34 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,46 +14,42 @@
 <Sha>9dfddc30a1e9101f7e44dcda57d95902073e444c</Sha>
 <SourceBuild RepoName="templating" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 <SourceBuild RepoName="runtime" ManagedOnly="false" />
 </Dependency>
 <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23421.3">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23411.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-alpha.1.23457.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
 <Uri>https://github.com/dotnet/emsdk</Uri>
 <Sha>abfa03c97f4175d4d209435cd0e71f558e36c3fd</Sha>
 <Sha>7da45c33d57a762de5756f2c090e84327dae143f</Sha>
 <SourceBuild RepoName="emsdk" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.Build" Version="17.8.0-preview-23462-02">
Expand DownExpand Up@@ -197,25 +193,25 @@
 <Uri>https://github.com/microsoft/vstest</Uri>
 <Sha>bb99e3ea07aaecd62d5c59568524133317d081b4</Sha>
 </Dependency>
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.CodeDom" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.CodeDom" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="System.Resources.Extensions" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Resources.Extensions" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-alpha.1.23456.3">
 <Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand DownExpand Up@@ -390,19 +386,19 @@
 <SourceBuild RepoName="symreader" ManagedOnly="true" />
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
 <Dependency Name="System.ServiceProcess.ServiceController" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
Expand All@@ -423,9 +419,9 @@
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
 </Dependency>
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-rc.1.23421.3">
 <Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-alpha.1.23464.19">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>f8c110b8003d68cc635add4ca791d6cf2e645561</Sha>
 <Sha>a6c64c3c26417f579022e20cbcee992b4814ed2c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
 <Uri>https://github.com/dotnet/xliff-tasks</Uri>
Expand Down

37 changes: 18 additions & 19 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,31 +35,30 @@
 <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
 <MicrosoftDotNetSignToolVersion>8.0.0-beta.23463.1</MicrosoftDotNetSignToolVersion>
 <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-rc.1.23421.3</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-alpha.1.23464.19</SystemSecurityCryptographyProtectedDataPackageVersion>
 <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
 <SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
 <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
 <SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
 <SystemReflectionMetadataLoadContextVersion>8.0.0-rc.1.23421.3</SystemReflectionMetadataLoadContextVersion>
 <SystemReflectionMetadataLoadContextVersion>9.0.0-alpha.1.23464.19</SystemReflectionMetadataLoadContextVersion>
 <SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
 <SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
 <MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23463.1</MicrosoftDeploymentDotNetReleasesVersion>
 <MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23421.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRefPackageVersion>
 <VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23464.19</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
 <MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
 <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
 <MicrosoftNETHostModelVersion>8.0.0-rc.1.23421.3</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsDependencyModelPackageVersion>
 <MicrosoftNETHostModelVersion>9.0.0-alpha.1.23464.19</MicrosoftNETHostModelVersion>
 <MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
 <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>8.0.0-rc.1.23421.3</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23421.3</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>8.0.0-rc.1.23421.3</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingConsoleVersion>9.0.0-alpha.1.23464.19</MicrosoftExtensionsLoggingConsoleVersion>
 <MicrosoftNETILLinkTasksPackageVersion>9.0.0-alpha.1.23464.19</MicrosoftNETILLinkTasksPackageVersion>
 <SystemServiceProcessServiceControllerVersion>9.0.0-alpha.1.23464.19</SystemServiceProcessServiceControllerVersion>
 <MicrosoftExtensionsLoggingPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingPackageVersion>
 <MicrosoftExtensionsLoggingAbstractionsPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
 </PropertyGroup>
Expand DownExpand Up@@ -88,9 +87,9 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/runtime -->
 <SystemCodeDomPackageVersion>8.0.0-rc.1.23421.3</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>8.0.0-rc.1.23421.3</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>8.0.0-rc.1.23421.3</SystemResourcesExtensionsPackageVersion>
 <SystemCodeDomPackageVersion>9.0.0-alpha.1.23464.19</SystemCodeDomPackageVersion>
 <SystemTextEncodingCodePagesPackageVersion>9.0.0-alpha.1.23464.19</SystemTextEncodingCodePagesPackageVersion>
 <SystemResourcesExtensionsPackageVersion>9.0.0-alpha.1.23464.19</SystemResourcesExtensionsPackageVersion>
 </PropertyGroup>
 <PropertyGroup>
 <!-- Dependencies from https://github.com/dotnet/format -->
Expand DownExpand Up@@ -208,13 +207,13 @@
 </PropertyGroup>
 <PropertyGroup>
 <!-- Workloads from dotnet/emsdk -->
 <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>8.0.0-rc.1.23411.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-alpha.1.23457.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
 <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
 <!-- emsdk workload prerelease version band must match the emsdk feature band -->
 <EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
 <!-- Workloads from dotnet/runtime use MicrosoftNETCoreAppRefPackageVersion because it has a stable name that does not include the full feature band -->
 <MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
 <!-- mono workload prerelease version band must match the runtime feature band -->
 <MonoWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 <MonoWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
 </PropertyGroup>
</Project>

4 changes: 2 additions & 2 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "tools": {
 "dotnet": "8.0.100-preview.7.23376.3",
 "dotnet": "9.0.100-alpha.1.23421.9",
 "runtimes": {
 "dotnet": [
 "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
 "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
 ],
 "aspnetcore": [
 "$(MicrosoftAspNetCoreAppRefPackageVersion)"
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <Nullable>enable</Nullable>
 <StrongNameKeyId>Open</StrongNameKeyId>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFramework>net6.0</TargetFramework>
 <TargetFramework>net8.0</TargetFramework>
 <TargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0</TargetFramework>
 <OutputType>Exe</OutputType>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

2 changes: 1 addition & 1 deletion
src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

 <PropertyGroup>
 <TargetFrameworks>net6.0;net472</TargetFrameworks>
 <TargetFrameworks>net8.0;net472</TargetFrameworks>
 <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net8.0;net472</TargetFrameworks>
 <StrongNameKeyId>Open</StrongNameKeyId>
 <Nullable>enable</Nullable>
Expand Down

1 change: 1 addition & 0 deletions
src/Assets/WasmOverride/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
<Project />

4 changes: 4 additions & 0 deletions
src/Assets/WasmOverride/Directory.Build.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
<Project>
 <!-- Overriding only when workload is installed, and targeting net8.0 -->
 <Import Project="WasmOverridePacks.targets" Condition="'$(WasmNativeWorkload)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '8.0'))" />
</Project>
Loading