Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[main] Update dependencies from dotnet/installer #21021

Merged
merged 14 commits into from
Aug 28, 2024
Merged

[main] Update dependencies from dotnet/installer #21021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c748725
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Aug 13, 2024
24ef690
Re-generate global.json for PR #21021: [main] Update dependencies fro…
Aug 13, 2024
475868a
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Aug 14, 2024
630d346
Re-generate global.json for PR #21021: [main] Update dependencies fro…
Aug 14, 2024
860c473
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Aug 15, 2024
beeb54f
Re-generate global.json for PR #21021: [main] Update dependencies fro…
Aug 15, 2024
87f54c1
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Aug 16, 2024
072e090
Re-generate global.json for PR #21021: [main] Update dependencies fro…
Aug 16, 2024
c1e916d
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Aug 20, 2024
1145f58
Re-generate global.json for PR #21021: [main] Update dependencies fro…
Aug 20, 2024
17a8732
Merge remote-tracking branch 'origin/main' into darc-main-ba8b4a5c-70…
rolfbjarne Aug 21, 2024
5ea2007
Bump timeout a little bit.
rolfbjarne Aug 26, 2024
91622f4
Merge remote-tracking branch 'origin/main' into darc-main-ba8b4a5c-70…
rolfbjarne Aug 26, 2024
6c6196b
[link sdk] Ignore test crashing on x64/macOS/CoreCLR.
rolfbjarne Aug 27, 2024
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
41 changes: 16 additions & 25 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,23 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-a64772f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-a64772f-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-5/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-a64772f-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-a64772f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-a64772f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a64772f5-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-e92f92e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-e92f92e-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-9/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-e92f92e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-8/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-e92f92e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-7/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-e92f92e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-6/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-e92f92e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-5/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-e92f92e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-e92f92e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-e92f92e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-e92f92e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-2f1db20" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-2f1db20-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-2f1db20-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-2f1db20-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-2f1db20-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-2f1db204-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-954f61d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd-8/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-2aade6b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-2aade6b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-2aade6b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-08338fc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-08338fca/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
Expand Down Expand Up @@ -71,18 +69,11 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
<add key="darc-int-dotnet-runtime-08338fc" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-2f1db20-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-2f1db20-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-2f1db20-3" value="true" />
<add key="darc-int-dotnet-aspnetcore-2f1db20-5" value="true" />
<add key="darc-int-dotnet-aspnetcore-2f1db20" value="true" />
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="true" />
<add key="darc-int-dotnet-aspnetcore-954f61d" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.109-servicing.24407.6">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.109-servicing.24419.10">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>dc7a330f651df44966b2630e039ba67ac74f6482</Sha>
<Sha>6e9002c2efcfc09687feca31864ebc987c3c9ec8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="8.0.0-rtm.23524.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>59edaad404d1b8e47080015ae8d0787f94c970df</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
<Sha>08338fcaa5c9b9a8190abb99222fed12aaba956c</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
<Sha>08338fcaa5c9b9a8190abb99222fed12aaba956c</Sha>
</Dependency>
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>2f1db20456007c9515068a35a65afdf99af70bc6</Sha>
<Sha>954f61dd38b33caa2b736c73530bd5a294174437</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.7" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.8" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>a64772f521c578bc9925578b1384d3a08a02d31d</Sha>
<Sha>e92f92efe5854b6fe013787830b59166cb9b4ed9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23509.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/cecil</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<PropertyGroup>
<!-- Versions updated by maestro -->
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23509.2</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.109-servicing.24407.6</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.7</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.109-servicing.24419.10</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.8</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkPackageVersion>8.0.0-rtm.23524.7</MicrosoftNETILLinkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.24408.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.7</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.8</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>8.0.0</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "8.0.109-servicing.24407.6"
"version": "8.0.109-servicing.24419.10"
}
}
5 changes: 5 additions & 0 deletions tests/linker/ios/link sdk/AotBugs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,11 @@ IEnumerable<KeyValuePair<T, string>> MakeEnumerable (KeyValuePair<T, string> []
}

[Test]
#if __MACOS__ && NET
#if !NET9_0_OR_GREATER // not sure if this issue is limited to .NET 8, but add this in so that we find out in our .NET 9 branch.
[Ignore ("https://github.com/dotnet/runtime/issues/107026")]
#endif
#endif
public void AsEnumerable_4114 ()
{
Enumbers<string> e = new Enumbers<string> ();
Expand Down
2 changes: 1 addition & 1 deletion tools/devops/automation/templates/mac/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ steps:
-GithubFailureCommentFile "$Env:GITHUB_FAILURE_COMMENT_FILE"
-StatusContext "${{ parameters.statusContext }}"
displayName: 'Run tests'
timeoutInMinutes: 60
timeoutInMinutes: 90
${{ if not(parameters.isPR) }}:
retryCountOnTaskFailure: ${{ parameters.retryCount }}
env:
Expand Down
Loading