diff --git a/NuGet.config b/NuGet.config index 9d3282f1b..2b33ebc7b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,14 +23,10 @@ <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 --> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-78685e2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-78685e24/nuget/v3/index.json" /> + <add key="darc-int-dotnet-sdk-a94faf9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-a94faf91/nuget/v3/index.json" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-28ae95b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-28ae95b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-5/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-28ae95b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-3/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-28ae95b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-2/nuget/v3/index.json" /> - <add key="darc-int-dotnet-windowsdesktop-28ae95b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-28ae95bc-1/nuget/v3/index.json" /> + <add key="darc-int-dotnet-windowsdesktop-1526afd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4/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" /> @@ -59,14 +55,10 @@ <!-- Begin: Package sources from dotnet-runtime --> <add key="darc-int-dotnet-runtime-08338fc" value="true" /> <!-- Begin: Package sources from dotnet-sdk --> - <add key="darc-int-dotnet-sdk-78685e2" value="true" /> + <add key="darc-int-dotnet-sdk-a94faf9" value="true" /> <!-- End: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-windowsdesktop --> - <add key="darc-int-dotnet-windowsdesktop-28ae95b-1" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-28ae95b-2" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-28ae95b-3" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-28ae95b-5" value="true" /> - <add key="darc-int-dotnet-windowsdesktop-28ae95b" value="true" /> + <add key="darc-int-dotnet-windowsdesktop-1526afd" 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.--> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0343eedc6..7a9755f5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -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.7" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>28ae95bc8703be1ebc194391b03b6477cf59bed2</Sha> + <Sha>1526afd4eae1d862d586402ef8e005151a919d52</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.7-servicing.24314.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.8-servicing.24366.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>28ae95bc8703be1ebc194391b03b6477cf59bed2</Sha> + <Sha>1526afd4eae1d862d586402ef8e005151a919d52</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.7-servicing.24314.3" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.8-servicing.24366.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>28ae95bc8703be1ebc194391b03b6477cf59bed2</Sha> + <Sha>1526afd4eae1d862d586402ef8e005151a919d52</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.7" CoherentParentDependency="Microsoft.NET.Sdk"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri> - <Sha>28ae95bc8703be1ebc194391b03b6477cf59bed2</Sha> + <Sha>1526afd4eae1d862d586402ef8e005151a919d52</Sha> </Dependency> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.8-servicing.24366.12" 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.108"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>78685e249cfb02ff5bb173837eb18296e42f399b</Sha> + <Sha>a94faf917070b9b475319f4e6c8625fb2313f7aa</Sha> </Dependency> - <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.108-servicing.24366.27"> + <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.108-servicing.24367.12"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>78685e249cfb02ff5bb173837eb18296e42f399b</Sha> + <Sha>a94faf917070b9b475319f4e6c8625fb2313f7aa</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk" Version="8.0.108-servicing.24366.27"> + <Dependency Name="Microsoft.NET.Sdk" Version="8.0.108-servicing.24367.12"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>78685e249cfb02ff5bb173837eb18296e42f399b</Sha> + <Sha>a94faf917070b9b475319f4e6c8625fb2313f7aa</Sha> <SourceBuild RepoName="sdk" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.108-servicing.24366.27"> + <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.108-servicing.24367.12"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> - <Sha>78685e249cfb02ff5bb173837eb18296e42f399b</Sha> + <Sha>a94faf917070b9b475319f4e6c8625fb2313f7aa</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> @@ -124,13 +124,13 @@ <Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha> </Dependency> <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> - <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.7-servicing.24313.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.8-servicing.24366.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> - <Sha>fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611</Sha> + <Sha>bd164556d31c13b09986f597f49a83bf836c165d</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.7-servicing.24313.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> + <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.8-servicing.24366.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> - <Sha>43bb8cc831c2658e1117415019264bfe6f644f94</Sha> + <Sha>883fc207bb50622d4458ff09ae6a62548783826a</Sha> </Dependency> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Uri>https://github.com/dotnet/fsharp</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index b9b8bdf51..9049b1fef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/winforms --> - <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.7-servicing.24313.8</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> + <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>8.0.8-servicing.24366.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Dependency from https://github.com/dotnet/wpf --> - <MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.7-servicing.24313.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion> + <MicrosoftDotNetWpfProjectTemplatesPackageVersion>8.0.8-servicing.24366.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Supported versions --> @@ -79,8 +79,8 @@ <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/sdk --> <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.108</MicrosoftDotNetCommonItemTemplatesPackageVersion> - <MicrosoftNETSdkPackageVersion>8.0.108-servicing.24366.27</MicrosoftNETSdkPackageVersion> - <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.108-servicing.24366.27</MicrosoftDotNetMSBuildSdkResolverPackageVersion> + <MicrosoftNETSdkPackageVersion>8.0.108-servicing.24367.12</MicrosoftNETSdkPackageVersion> + <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.108-servicing.24367.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> @@ -105,10 +105,10 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/windowsdesktop --> - <VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.7-servicing.24314.3</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion> - <VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.7-servicing.24314.3</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion> - <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.7</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> - <MicrosoftWindowsDesktopAppRefPackageVersion>8.0.7</MicrosoftWindowsDesktopAppRefPackageVersion> + <VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion>8.0.8-servicing.24366.8</VSRedistCommonWindowsDesktopSharedFrameworkx6480PackageVersion> + <VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion>8.0.8-servicing.24366.8</VSRedistCommonWindowsDesktopTargetingPackx6480PackageVersion> + <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>8.0.8</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion> + <MicrosoftWindowsDesktopAppRefPackageVersion>8.0.8</MicrosoftWindowsDesktopAppRefPackageVersion> </PropertyGroup> <PropertyGroup> <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->