Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<packageSources>
<clear />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
Expand Down
44 changes: 22 additions & 22 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props
<!-- dotnet/dotnet dependencies -->
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25466.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25466.104</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25466.104</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25466.104</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25466.104</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25466.104</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25466.104</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25466.104</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25473.107</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25473.107</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25473.107</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25473.107</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25473.107</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25473.107</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25473.107</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25473.107</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rc.1.25466.104</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25466.104</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25466.104</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25466.104</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25466.104</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25466.104</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25466.104</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25466.104</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25466.104</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25466.104</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25466.104</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25466.104</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25466.104</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25466.104</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rc.1.25473.107</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25473.107</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25473.107</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25473.107</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25473.107</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25473.107</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25473.107</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25473.107</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25473.107</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25473.107</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25473.107</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25473.107</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25473.107</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25473.107</SystemWindowsExtensionsPackageVersion>
<!-- _git/dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rc.1.25466.1</MicrosoftDotNetWpfDncEngPackageVersion>
</PropertyGroup>
Expand Down
90 changes: 45 additions & 45 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,78 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="c0d13804f97528f7b3750ca31846f83c4617a451" BarId="283489" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="77d8896addbd65ffbe48dc39dcf912843fcf7727" BarId="284343" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25466.104">
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25466.104">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25466.104">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rc.1.25466.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>3567f4b428acc1a49fda38d150415482cc916dd8</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25466.104">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -84,21 +84,21 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25466.104">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25466.104">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25466.104">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25466.104">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
Expand All @@ -109,9 +109,9 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
</Dependency>
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25466.104">
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25473.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c0d13804f97528f7b3750ca31846f83c4617a451</Sha>
<Sha>77d8896addbd65ffbe48dc39dcf912843fcf7727</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</PropertyGroup>
<!-- Docs / Intellisense -->
<PropertyGroup>
<MicrosoftPrivateIntellisenseVersion>9.0.0-preview-20241010.1</MicrosoftPrivateIntellisenseVersion>
<MicrosoftPrivateIntellisenseVersion>10.0.0-preview-20250912.1</MicrosoftPrivateIntellisenseVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
}

$dotnetVersions = @('5','6','7','8','9')
$dotnetVersions = @('5','6','7','8','9','10')

foreach ($dotnetVersion in $dotnetVersions) {
$feedPrefix = "dotnet" + $dotnetVersion;
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
PackageSources+=('dotnet3.1-internal-transport')
fi

DotNetVersions=('5' '6' '7' '8' '9')
DotNetVersions=('5' '6' '7' '8' '9' '10')

for DotNetVersion in ${DotNetVersions[@]} ; do
FeedPrefix="dotnet${DotNetVersion}";
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25466.104",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25466.104",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25473.107",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25473.107",
"Microsoft.Build.NoTargets": "3.7.56"
},
"native-tools": {
Expand Down