Merged PR 36354: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20240111.11 - **Date Produced**: January 11, 2024 8:04:09 PM UTC - **Commit**: c156e4feae5e45c934d00ed95b47b7504418fb4d - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.102 to 8.0.102][4] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.102-servicing.24060.23 to 8.0.102-servicing.24061.11][4] - **Microsoft.NET.Sdk**: [from 8.0.102-servicing.24060.23 to 8.0.102-servicing.24061.11][4] - **Microsoft.TemplateEngine.Cli**: [from 8.0.102-servicing.24060.23 to 8.0.102-servicing.24061.11][4] - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.1 to 8.0.2][5] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.1-servicing.23580.5 to 8.0.2-servicing.24060.14][5] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.1-servicing.23580.5 to 8.0.2-servicing.24060.14][5] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.1 to 8.0.2][5] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.1 to 8.0.2][5] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 8.0.1-servicing.23580.5 to 8.0.2-servicing.24060.10][6] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8533fc688e9b1ee8c8c47c1737effd3de13fbca0&targetVersion=GCc156e4feae5e45c934d00ed95b47b7504418fb4d&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCa0e7b5d8673f28c41bcac6e2001b39ba2c8fab54&targetVersion=GCf195aa9c97a34be19c176a512bd10d36914931cb&_a=files [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCac40bed7a33baf164d3984ca90c2aedba996a7b2&targetVersion=GC0ede9037ff59dc76c37ec87659a641cfbccd6e30&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) [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.WindowsDesktop.App.Ref**: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.5 to 8.0.2-servicing.24060.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.1-servicing.23580.5 to 8.0.2-servicing.24060.14 (parent: Microsoft.NET.Sdk) - **Micro...
This commit is contained in:
DotNet Bot
Sean Reeser
commit
6510f139b4
3 changed files with 28 additions and 32 deletions
12
NuGet.config
12
NuGet.config
|
|
@ -26,12 +26,10 @@
|
|||
<add key="darc-int-dotnet-runtime-bf5e279-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-8533fc6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8533fc68/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-c156e4f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-c156e4fe/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-a0e7b5d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-a0e7b5d8/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-a0e7b5d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-a0e7b5d8-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-a0e7b5d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-a0e7b5d8-1/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-f195aa9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f195aa9c/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="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
||||
|
|
@ -61,12 +59,10 @@
|
|||
<add key="darc-int-dotnet-runtime-bf5e279-2" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-bf5e279" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-8533fc6" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-c156e4f" value="true" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-a0e7b5d-1" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-a0e7b5d-2" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-a0e7b5d" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-f195aa9" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
|
|
|
|||
|
|
@ -5,21 +5,21 @@
|
|||
Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos.
|
||||
The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal.
|
||||
-->
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54</Sha>
|
||||
<Sha>f195aa9c97a34be19c176a512bd10d36914931cb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.1-servicing.23580.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.2-servicing.24060.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54</Sha>
|
||||
<Sha>f195aa9c97a34be19c176a512bd10d36914931cb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.1-servicing.23580.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.2-servicing.24060.14" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54</Sha>
|
||||
<Sha>f195aa9c97a34be19c176a512bd10d36914931cb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54</Sha>
|
||||
<Sha>f195aa9c97a34be19c176a512bd10d36914931cb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.1-servicing.23580.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
|
|
@ -87,20 +87,20 @@
|
|||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.102">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>8533fc688e9b1ee8c8c47c1737effd3de13fbca0</Sha>
|
||||
<Sha>c156e4feae5e45c934d00ed95b47b7504418fb4d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.102-servicing.24060.23">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.102-servicing.24061.11">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>8533fc688e9b1ee8c8c47c1737effd3de13fbca0</Sha>
|
||||
<Sha>c156e4feae5e45c934d00ed95b47b7504418fb4d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.102-servicing.24060.23">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.102-servicing.24061.11">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>8533fc688e9b1ee8c8c47c1737effd3de13fbca0</Sha>
|
||||
<Sha>c156e4feae5e45c934d00ed95b47b7504418fb4d</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.102-servicing.24060.23">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.102-servicing.24061.11">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>8533fc688e9b1ee8c8c47c1737effd3de13fbca0</Sha>
|
||||
<Sha>c156e4feae5e45c934d00ed95b47b7504418fb4d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
|
|
@ -128,9 +128,9 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
|
||||
<Sha>0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.1-servicing.23580.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.2-servicing.24060.10" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||
<Sha>ac40bed7a33baf164d3984ca90c2aedba996a7b2</Sha>
|
||||
<Sha>0ede9037ff59dc76c37ec87659a641cfbccd6e30</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.0-beta.23563.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.1-servicing.23580.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.2-servicing.24060.10</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -86,8 +86,8 @@
|
|||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.102</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.102-servicing.24060.23</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.102-servicing.24060.23</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.102-servicing.24061.11</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.102-servicing.24061.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -112,10 +112,10 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.1-servicing.23580.5</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.1-servicing.23580.5</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.1</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.2-servicing.24060.14</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.2-servicing.24060.14</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>8.0.2</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
|
|||
Loading…
Reference in a new issue