Skip to content
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

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #45094

Merged
merged 27 commits into from
Nov 25, 2024
Merged

[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' #45094

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7377ba4
Merged PR 43126: [internal/release/8.0.1xx] Update dependencies from …
Sep 24, 2024
9b27227
Merge commit 'c1f738a4ae61eac0fbbd3826753fb7a3eb8030af'
Oct 2, 2024
d3aaf79
Merged PR 43912: [internal/release/8.0.1xx] Merge from public
vseanreesermsft Oct 17, 2024
62c3bd5
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 17, 2024
d8efb48
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 18, 2024
9c0f04a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 18, 2024
bd5c6c6
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 18, 2024
cf2c44b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 21, 2024
4f203da
Merged PR 43933: [internal/release/8.0.1xx] Update dependencies from …
Oct 21, 2024
74b2f41
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 22, 2024
36cf688
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Oct 22, 2024
f3835a7
Merged PR 44079: [internal/release/8.0.1xx] Update dependencies from …
Oct 22, 2024
b3f71fa
Merge commit 'f3835a7fb45497f53fc92ca7dd4a06793884b1cd' into internal…
vseanreesermsft Nov 12, 2024
88e514c
Fix the template tests
marcpopMSFT Nov 12, 2024
c6fce02
Merging internal commits for release/8.0.1xx (#44824)
marcpopMSFT Nov 13, 2024
3911022
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 14, 2024
ccaa6b0
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Nov 15, 2024
dbac151
Update dependencies from https://github.com/dotnet/razor build 202411…
dotnet-maestro[bot] Nov 16, 2024
2bc3ee8
[release/8.0.1xx] Update dependencies from dotnet/razor (#44900)
v-codyguan Nov 18, 2024
c9bfb52
[release/8.0.1xx] Update dependencies from dotnet/templating (#44883)
v-codyguan Nov 19, 2024
055e879
[release/8.0.1xx] Update dependencies from dotnet/arcade (#44872)
marcpopMSFT Nov 19, 2024
6915717
Update dependencies from https://github.com/dotnet/razor build 202411…
dotnet-maestro[bot] Nov 24, 2024
b522889
Update dependencies from https://github.com/dotnet/roslyn build 20241…
dotnet-maestro[bot] Nov 24, 2024
0d47aa1
Work around COM concurrency issue when accessing VS instances
joeloff Nov 24, 2024
f93bb0c
[release/8.0.1xx] Update dependencies from dotnet/razor (#45074)
joeloff Nov 24, 2024
4a50aac
[release/8.0.1xx] Update dependencies from dotnet/roslyn (#45080)
joeloff Nov 24, 2024
eff3a2c
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
v-wuzhai Nov 25, 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
Next Next commit
Merged PR 43126: [internal/release/8.0.1xx] Update dependencies from … 
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.10 to 8.0.9 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:dd95552e-72fb-4363-9b59-08dbd5a5c3e7)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: dd95552e-72fb-4363-9b59-08dbd5a5c3e7
- **Build**: 20240924.4
- **Date Produced**: September 24, 2024 10:50:51 PM UTC
- **Commit**: 81cabf2857a01351e5ab578947c7403a5b128ad1
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.DependencyModel**: [from 8.0.2 to 8.0.2][3]
  - **Microsoft.Extensions.Logging**: [from 8.0.1 to 8.0.1][3]
  - **Microsoft.Extensions.Logging.Abstractions**: [from 8.0.2 to 8.0.2][3]
  - **Microsoft.Extensions.Logging.Console**: [from 8.0.1 to 8.0.1][3]
  - **Microsoft.NET.HostModel**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3]
  - **Microsoft.NET.ILLink.Tasks**: [from 8.0.10 to 8.0.10][3]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.10 to 8.0.10][3]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.10 to 8.0.10][3]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.10 to 8.0.10][3]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.10 to 8.0.10][3]
  - **Microsoft.NETCore.Platforms**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3]
  - **System.Configuration.ConfigurationManager**: [from 8.0.1 to 8.0.1][3]
  - **System.Diagnostics.EventLog**: [from 8.0.1 to 8.0.1][3]
  - **System.Reflection.MetadataLoadContext**: [from 8.0.1 to 8.0.1][3]
  - **System.Security.Cryptography.Pkcs**: [from 8.0.1 to 8.0.1][3]
  - **System.Security.Cryptography.Xml**: [from 8.0.2 to 8.0.2][3]
  - **System.ServiceProcess.ServiceController**: [from 8.0.1 to 8.0.1][3]
  - **System.Text.Json**: [from 8.0.5 to 8.0.5][3]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.10-servicing.24474.6 to 8.0.10-servicing.24474.4][3]
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.10 to 8.0.9][4]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCdcf4a22cf8671c1abe880ebec4cfd906c99588bf&targetVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&_a=files
[4]: https://git...
  • Loading branch information
@vseanreesermsft
maestro-prod-Primary authored and vseanreesermsft committed Sep 24, 2024
commit 7377ba4168d02659bee80698fbafb33b07ea99a6
20 changes: 18 additions & 2 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,18 @@
<!--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-d667257" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-d667257-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-d667257-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d6672570-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-format -->
<add key="darc-int-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656/nuget/v3/index.json" />
<add key="darc-int-dotnet-format-27f1865-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-format-27f1865-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-format -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-b5265ef" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-b5265ef3/nuget/v3/index.json" />
Expand All @@ -22,7 +28,7 @@
<add key="darc-int-dotnet-runtime-e77011b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e77011b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e77011b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-81cabf2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-81cabf28/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-81cabf2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-81cabf28-3/nuget/v3/index.json" />
<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" />
Expand All @@ -31,9 +37,13 @@
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-pub-dotnet-templating-450f4db" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-450f4db-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-450f4db-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-450f4db7-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f655eec" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f655eecd-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
Expand All @@ -58,9 +68,13 @@
<!-- Begin: Package sources from dotnet-templating -->
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-c2a4429-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-c2a4429-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-format -->
<add key="darc-int-dotnet-format-27f1865-1" value="true" />
<add key="darc-int-dotnet-format-27f1865-2" value="true" />
<add key="darc-int-dotnet-format-27f1865" value="true" />
<!-- End: Package sources from dotnet-format -->
<!-- End: Package sources from dotnet-aspnetcore -->
Expand All @@ -70,14 +84,16 @@
<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-81cabf2" value="true" />
<add key="darc-int-dotnet-runtime-81cabf2-3" value="true" />
<add key="darc-int-dotnet-runtime-e77011b-1" value="true" />
<add key="darc-int-dotnet-runtime-e77011b-2" value="true" />
<add key="darc-int-dotnet-runtime-e77011b-3" value="true" />
<add key="darc-int-dotnet-runtime-e77011b-5" value="true" />
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-f655eec-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f655eec-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-f655eec" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.10-servicing.24466.10">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.10-servicing.24474.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.10-servicing.24466.10">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.10-servicing.24474.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
</Dependency>
Expand All @@ -35,11 +35,11 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.10-servicing.24466.10">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.10-servicing.24474.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.10-servicing.24466.10">
<Dependency Name="Microsoft.NET.HostModel" Version="8.0.10-servicing.24474.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
</Dependency>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>8.0.10</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.10-servicing.24466.10</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.10-servicing.24474.4</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.10</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>8.0.10-servicing.24466.10</MicrosoftNETHostModelVersion>
<MicrosoftNETHostModelVersion>8.0.10-servicing.24474.4</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.2</MicrosoftExtensionsLoggingAbstractionsVersion>
Expand Down