File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -21,8 +21,8 @@ This file should be imported by eng/Versions.props
2121 <!-- dotnet/corefx dependencies -->
2222 <SystemComponentModelCompositionPackageVersion >4.5.0</SystemComponentModelCompositionPackageVersion >
2323 <!-- dotnet/dotnet dependencies -->
24- <MicrosoftDotNetArcadeSdkPackageVersion >10.0.0-beta.25531.102 </MicrosoftDotNetArcadeSdkPackageVersion >
25- <MicrosoftDotNetXliffTasksPackageVersion >10.0.0-beta.25531.102 </MicrosoftDotNetXliffTasksPackageVersion >
24+ <MicrosoftDotNetArcadeSdkPackageVersion >10.0.0-beta.25555.106 </MicrosoftDotNetArcadeSdkPackageVersion >
25+ <MicrosoftDotNetXliffTasksPackageVersion >10.0.0-beta.25555.106 </MicrosoftDotNetXliffTasksPackageVersion >
2626 </PropertyGroup >
2727 <!-- Property group for alternate package version names-->
2828 <PropertyGroup >
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" utf-8" ?>
22<Dependencies >
3- <Source Uri =" https://github.com/dotnet/dotnet" Mapping =" nuget-client" Sha =" ba86126261026d26f7c30cd3434680d3965a88cf " BarId =" 289152 " />
3+ <Source Uri =" https://github.com/dotnet/dotnet" Mapping =" nuget-client" Sha =" e17b0d08def649f30aed9c09cf4a2c5741a3c76c " BarId =" 289695 " />
44 <!--
55 Currently this file is required to publish builds to .NET build asset registry.
66 See https://github.com/dotnet/arcade/issues/2396 for details.
5656 </Dependency >
5757 </ProductDependencies >
5858 <ToolsetDependencies >
59- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 10.0.0-beta.25531.102 " >
59+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 10.0.0-beta.25555.106 " >
6060 <Uri >https://github.com/dotnet/dotnet</Uri >
61- <Sha >ba86126261026d26f7c30cd3434680d3965a88cf </Sha >
61+ <Sha >e17b0d08def649f30aed9c09cf4a2c5741a3c76c </Sha >
6262 </Dependency >
63- <Dependency Name =" Microsoft.DotNet.XliffTasks" Version =" 10.0.0-beta.25531.102 " >
63+ <Dependency Name =" Microsoft.DotNet.XliffTasks" Version =" 10.0.0-beta.25555.106 " >
6464 <Uri >https://github.com/dotnet/dotnet</Uri >
65- <Sha >ba86126261026d26f7c30cd3434680d3965a88cf </Sha >
65+ <Sha >e17b0d08def649f30aed9c09cf4a2c5741a3c76c </Sha >
6666 </Dependency >
6767 </ToolsetDependencies >
6868</Dependencies >
Original file line number Diff line number Diff line change 11# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
2- # dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
3- # disabled internal Maestro (darc-int*) feeds.
2+ # dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
3+ # dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
4+ # In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
45#
56# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
67#
@@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) {
173174 }
174175}
175176
177+ # Check for dotnet-eng and add dotnet-eng-internal if present
178+ $dotnetEngSource = $sources.SelectSingleNode (" add[@key='dotnet-eng']" )
179+ if ($dotnetEngSource -ne $null ) {
180+ 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
181+ }
182+
183+ # Check for dotnet-tools and add dotnet-tools-internal if present
184+ $dotnetToolsSource = $sources.SelectSingleNode (" add[@key='dotnet-tools']" )
185+ if ($dotnetToolsSource -ne $null ) {
186+ 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
187+ }
188+
176189$doc.Save ($filename )
Original file line number Diff line number Diff line change 11#! /usr/bin/env bash
22
33# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
4- # dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
5- # disabled internal Maestro (darc-int*) feeds.
4+ # dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
5+ # dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
6+ # In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
67#
78# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
89#
@@ -173,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
173174 fi
174175done
175176
177+ # Check for dotnet-eng and add dotnet-eng-internal if present
178+ grep -i " <add key=\" dotnet-eng\" " $ConfigFile > /dev/null
179+ if [ " $? " == " 0" ]; then
180+ AddOrEnablePackageSource " dotnet-eng-internal" " https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix "
181+ fi
182+
183+ # Check for dotnet-tools and add dotnet-tools-internal if present
184+ grep -i " <add key=\" dotnet-tools\" " $ConfigFile > /dev/null
185+ if [ " $? " == " 0" ]; then
186+ AddOrEnablePackageSource " dotnet-tools-internal" " https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix "
187+ fi
188+
176189# I want things split line by line
177190PrevIFS=$IFS
178191IFS=$' \n '
Original file line number Diff line number Diff line change 99 "pinned" : true
1010 },
1111 "msbuild-sdks" : {
12- "Microsoft.DotNet.Arcade.Sdk" : " 10.0.0-beta.25531.102 " ,
12+ "Microsoft.DotNet.Arcade.Sdk" : " 10.0.0-beta.25555.106 " ,
1313 "Microsoft.Build.NoTargets" : " 3.7.0"
1414 }
1515}
You can’t perform that action at this time.
0 commit comments