Skip to content
Open
Show file tree
Hide file tree
Changes from 3 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
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-ba86126" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-ba861262/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-e17b0d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-e17b0d08/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/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>10.0.0-beta.25531.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rtm.25531.102</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25531.102</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rtm.25531.102</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25555.106</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25555.106</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25555.106</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25555.106</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.1-servicing.25555.106</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.1-servicing.25555.106</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.1-servicing.25555.106</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>10.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rtm.25531.102</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>10.0.1</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.1</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.1</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.1</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.1</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.1</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.1-servicing.25555.106</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.1</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.1</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.1</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.1</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.1</SystemWindowsExtensionsPackageVersion>
<!-- _git/dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-rtm.25513.4</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="ba86126261026d26f7c30cd3434680d3965a88cf" BarId="289152" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="e17b0d08def649f30aed9c09cf4a2c5741a3c76c" BarId="289695" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rtm.25531.102">
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.1-servicing.25555.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rtm.25531.102">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.1-servicing.25555.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0">
<Dependency Name="System.Windows.Extensions" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rtm.25531.102">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.1-servicing.25555.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-rtm.25513.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>bbb14872ef0b8cdc8c2ebcd4f19f78024d5f560c</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0">
<Dependency Name="System.Resources.Extensions" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0">
<Dependency Name="System.CodeDom" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0">
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.0">
<Dependency Name="System.DirectoryServices" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0">
<Dependency Name="System.Formats.Nrbf" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.0">
<Dependency Name="System.IO.Packaging" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0">
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.0">
<Dependency Name="System.Security.Permissions" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.0">
<Dependency Name="System.Drawing.Common" Version="10.0.1">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -84,25 +84,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rtm.25531.102">
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.1-servicing.25555.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25531.102">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25555.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25531.102">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25555.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25531.102">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25555.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25531.102">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25555.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
<Sha>e17b0d08def649f30aed9c09cf4a2c5741a3c76c</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 Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<PropertyGroup>
<MajorVersion>10</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
<PatchVersion>1</PatchVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration></PreReleaseVersionIteration>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<!--
Expand Down
17 changes: 15 additions & 2 deletions eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
# disabled internal Maestro (darc-int*) feeds.
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
#
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
#
Expand Down Expand Up @@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) {
}
}

# Check for dotnet-eng and add dotnet-eng-internal if present
$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
if ($dotnetEngSource -ne $null) {
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
}

# Check for dotnet-tools and add dotnet-tools-internal if present
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
if ($dotnetToolsSource -ne $null) {
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
}

$doc.Save($filename)
17 changes: 15 additions & 2 deletions eng/common/SetupNugetSources.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/usr/bin/env bash

# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
# disabled internal Maestro (darc-int*) feeds.
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
#
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
#
Expand Down Expand Up @@ -173,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
fi
done

# Check for dotnet-eng and add dotnet-eng-internal if present
grep -i "<add key=\"dotnet-eng\"" $ConfigFile > /dev/null
if [ "$?" == "0" ]; then
AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
fi

# Check for dotnet-tools and add dotnet-tools-internal if present
grep -i "<add key=\"dotnet-tools\"" $ConfigFile > /dev/null
if [ "$?" == "0" ]; then
AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
fi

# I want things split line by line
PrevIFS=$IFS
IFS=$'\n'
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": "10.0.0-beta.25531.102",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25531.102",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25555.106",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25555.106",
"Microsoft.Build.NoTargets": "3.7.56"
},
"native-tools": {
Expand Down