Skip to content

Commit a915b78

Browse files
rmarinhormarinho
authored
Merge branch 'net10.0' into update-main-net10
2 parents c917bb8 + 48f299f commit a915b78

File tree

98 files changed

+3167
-1224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+3167
-1224
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"rollForward": false
2525
},
2626
"microsoft.dotnet.xharness.cli": {
27-
"version": "10.0.0-prerelease.25375.1",
27+
"version": "10.0.0-prerelease.25427.1",
2828
"commands": [
2929
"xharness"
3030
],

‎NuGet.config‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66
<clear />
77
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
88
<!-- Begin: Package sources from dotnet-android -->
9+
<add key="darc-pub-dotnet-android-1dcfb6f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-1dcfb6f8/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-android-1dcfb6f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-1dcfb6f8-1/nuget/v3/index.json" />
911
<!-- End: Package sources from dotnet-android -->
1012
<!-- Begin: Package sources from dotnet-macios -->
11-
<add key="darc-pub-dotnet-macios-af20d0b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-af20d0b6/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-macios-4681bf9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4681bf92/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-macios-4681bf9-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4681bf92-1/nuget/v3/index.json" />
1215
<!-- End: Package sources from dotnet-macios -->
1316
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1417
<add key="local" value="LOCAL_PLACEHOLDER" />

‎eng/Version.Details.xml‎

Lines changed: 96 additions & 96 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -30,41 +30,41 @@
3030
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
3131
<MicrosoftMauiPreviousDotNetReleasedVersion>9.0.82</MicrosoftMauiPreviousDotNetReleasedVersion>
3232
<!-- dotnet/sdk -->
33-
<MicrosoftNETSdkPackageVersion>10.0.100-rc.1.25416.112</MicrosoftNETSdkPackageVersion>
33+
<MicrosoftNETSdkPackageVersion>10.0.100-rc.2.25461.112</MicrosoftNETSdkPackageVersion>
3434
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
3535
<!-- dotnet/runtime -->
36-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25416.112</MicrosoftNETCoreAppRefPackageVersion>
36+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25461.112</MicrosoftNETCoreAppRefPackageVersion>
3737
<SystemTextJsonPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextJsonPackageVersion>
3838
<SystemTextEncodingsWebPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemTextEncodingsWebPackageVersion>
3939
<MicrosoftBclAsyncInterfacesPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftBclAsyncInterfacesPackageVersion>
4040
<!-- Microsoft/Extensions -->
4141
<SystemCodeDomPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemCodeDomPackageVersion>
42-
<MicrosoftExtensionsConfigurationVersion>10.0.0-rc.1.25416.112</MicrosoftExtensionsConfigurationVersion>
43-
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-rc.1.25416.112</MicrosoftExtensionsConfigurationAbstractionsVersion>
44-
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-rc.1.25416.112</MicrosoftExtensionsConfigurationJsonVersion>
45-
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-rc.1.25416.112</MicrosoftExtensionsDependencyInjectionVersion>
46-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-rc.1.25416.112</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
47-
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-rc.1.25416.112</MicrosoftExtensionsFileProvidersAbstractionsVersion>
48-
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-rc.1.25416.112</MicrosoftExtensionsLoggingAbstractionsVersion>
49-
<MicrosoftExtensionsLoggingVersion>10.0.0-rc.1.25416.112</MicrosoftExtensionsLoggingVersion>
50-
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-rc.1.25416.112</MicrosoftExtensionsLoggingConsoleVersion>
51-
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-rc.1.25416.112</MicrosoftExtensionsLoggingDebugVersion>
52-
<MicrosoftExtensionsPrimitivesVersion>10.0.0-rc.1.25416.112</MicrosoftExtensionsPrimitivesVersion>
53-
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-rc.1.25416.112</MicrosoftExtensionsHostingAbstractionsVersion>
42+
<MicrosoftExtensionsConfigurationVersion>10.0.0-rc.2.25461.112</MicrosoftExtensionsConfigurationVersion>
43+
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-rc.2.25461.112</MicrosoftExtensionsConfigurationAbstractionsVersion>
44+
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-rc.2.25461.112</MicrosoftExtensionsConfigurationJsonVersion>
45+
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-rc.2.25461.112</MicrosoftExtensionsDependencyInjectionVersion>
46+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-rc.2.25461.112</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
47+
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-rc.2.25461.112</MicrosoftExtensionsFileProvidersAbstractionsVersion>
48+
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-rc.2.25461.112</MicrosoftExtensionsLoggingAbstractionsVersion>
49+
<MicrosoftExtensionsLoggingVersion>10.0.0-rc.2.25461.112</MicrosoftExtensionsLoggingVersion>
50+
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-rc.2.25461.112</MicrosoftExtensionsLoggingConsoleVersion>
51+
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-rc.2.25461.112</MicrosoftExtensionsLoggingDebugVersion>
52+
<MicrosoftExtensionsPrimitivesVersion>10.0.0-rc.2.25461.112</MicrosoftExtensionsPrimitivesVersion>
53+
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-rc.2.25461.112</MicrosoftExtensionsHostingAbstractionsVersion>
5454
<!-- xamarin/xamarin-android -->
55-
<MicrosoftAndroidSdkWindowsPackageVersion>36.0.0-rc.1.280</MicrosoftAndroidSdkWindowsPackageVersion>
56-
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.92</MicrosoftNETSdkAndroidManifest90100PackageVersion>
55+
<MicrosoftAndroidSdkWindowsPackageVersion>36.0.0-ci.main.309</MicrosoftAndroidSdkWindowsPackageVersion>
56+
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.105</MicrosoftNETSdkAndroidManifest90100PackageVersion>
5757
<AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
5858
<!-- xamarin/xamarin-macios -->
59-
<MicrosoftMacCatalystSdknet100_185PackageVersion>18.5.10722-net10-rc.1</MicrosoftMacCatalystSdknet100_185PackageVersion>
60-
<MicrosoftmacOSSdknet100_155PackageVersion>15.5.10722-net10-rc.1</MicrosoftmacOSSdknet100_155PackageVersion>
61-
<MicrosoftiOSSdknet100_185PackageVersion>18.5.10722-net10-rc.1</MicrosoftiOSSdknet100_185PackageVersion>
62-
<MicrosofttvOSSdknet100_185PackageVersion>18.5.10722-net10-rc.1</MicrosofttvOSSdknet100_185PackageVersion>
59+
<MicrosoftMacCatalystSdknet100_185PackageVersion>18.5.10849-net10-rc.2</MicrosoftMacCatalystSdknet100_185PackageVersion>
60+
<MicrosoftmacOSSdknet100_155PackageVersion>15.5.10849-net10-rc.2</MicrosoftmacOSSdknet100_155PackageVersion>
61+
<MicrosoftiOSSdknet100_185PackageVersion>18.5.10849-net10-rc.2</MicrosoftiOSSdknet100_185PackageVersion>
62+
<MicrosofttvOSSdknet100_185PackageVersion>18.5.10849-net10-rc.2</MicrosofttvOSSdknet100_185PackageVersion>
6363
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
64-
<MicrosoftMacCatalystSdknet90_185PackageVersion>18.5.9216</MicrosoftMacCatalystSdknet90_185PackageVersion>
65-
<MicrosoftmacOSSdknet90_155PackageVersion>15.5.9216</MicrosoftmacOSSdknet90_155PackageVersion>
66-
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9216</MicrosoftiOSSdknet90_185PackageVersion>
67-
<MicrosofttvOSSdknet90_185PackageVersion>18.5.9216</MicrosofttvOSSdknet90_185PackageVersion>
64+
<MicrosoftMacCatalystSdknet90_185PackageVersion>18.5.9227</MicrosoftMacCatalystSdknet90_185PackageVersion>
65+
<MicrosoftmacOSSdknet90_155PackageVersion>15.5.9227</MicrosoftmacOSSdknet90_155PackageVersion>
66+
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
67+
<MicrosofttvOSSdknet90_185PackageVersion>18.5.9227</MicrosofttvOSSdknet90_185PackageVersion>
6868
<!-- Samsung/Tizen.NET -->
6969
<SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
7070
<!-- wasdk -->
@@ -73,19 +73,19 @@
7373
<MicrosoftGraphicsWin2DPackageVersion>1.3.2</MicrosoftGraphicsWin2DPackageVersion>
7474
<MicrosoftWindowsWebView2PackageVersion>1.0.3179.45</MicrosoftWindowsWebView2PackageVersion>
7575
<!-- Everything else -->
76-
<MicrosoftAspNetCoreAuthorizationPackageVersion>10.0.0-rc.1.25416.112</MicrosoftAspNetCoreAuthorizationPackageVersion>
77-
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>10.0.0-rc.1.25416.112</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
78-
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>10.0.0-rc.1.25416.112</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
79-
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>10.0.0-rc.1.25416.112</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
80-
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>10.0.0-rc.1.25416.112</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
81-
<MicrosoftAspNetCoreComponentsFormsPackageVersion>10.0.0-rc.1.25416.112</MicrosoftAspNetCoreComponentsFormsPackageVersion>
82-
<MicrosoftAspNetCoreComponentsPackageVersion>10.0.0-rc.1.25416.112</MicrosoftAspNetCoreComponentsPackageVersion>
83-
<MicrosoftAspNetCoreComponentsWebPackageVersion>10.0.0-rc.1.25416.112</MicrosoftAspNetCoreComponentsWebPackageVersion>
84-
<MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>10.0.0-rc.1.25416.112</MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>
85-
<MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>10.0.0-rc.1.25416.112</MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>
86-
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>10.0.0-rc.1.25416.112</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
87-
<MicrosoftAspNetCoreMetadataPackageVersion>10.0.0-rc.1.25416.112</MicrosoftAspNetCoreMetadataPackageVersion>
88-
<MicrosoftJSInteropPackageVersion>10.0.0-rc.1.25416.112</MicrosoftJSInteropPackageVersion>
76+
<MicrosoftAspNetCoreAuthorizationPackageVersion>10.0.0-rc.2.25461.112</MicrosoftAspNetCoreAuthorizationPackageVersion>
77+
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>10.0.0-rc.2.25461.112</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
78+
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>10.0.0-rc.2.25461.112</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
79+
<MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>10.0.0-rc.2.25461.112</MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion>
80+
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>10.0.0-rc.2.25461.112</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
81+
<MicrosoftAspNetCoreComponentsFormsPackageVersion>10.0.0-rc.2.25461.112</MicrosoftAspNetCoreComponentsFormsPackageVersion>
82+
<MicrosoftAspNetCoreComponentsPackageVersion>10.0.0-rc.2.25461.112</MicrosoftAspNetCoreComponentsPackageVersion>
83+
<MicrosoftAspNetCoreComponentsWebPackageVersion>10.0.0-rc.2.25461.112</MicrosoftAspNetCoreComponentsWebPackageVersion>
84+
<MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>10.0.0-rc.2.25461.112</MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion>
85+
<MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>10.0.0-rc.2.25461.112</MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion>
86+
<MicrosoftAspNetCoreComponentsWebViewPackageVersion>10.0.0-rc.2.25461.112</MicrosoftAspNetCoreComponentsWebViewPackageVersion>
87+
<MicrosoftAspNetCoreMetadataPackageVersion>10.0.0-rc.2.25461.112</MicrosoftAspNetCoreMetadataPackageVersion>
88+
<MicrosoftJSInteropPackageVersion>10.0.0-rc.2.25461.112</MicrosoftJSInteropPackageVersion>
8989
<!-- Everything else (previous edition) -->
9090
<MicrosoftAspNetCorePackageVersion>8.0.16</MicrosoftAspNetCorePackageVersion>
9191
<MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>$(MicrosoftAspNetCorePackageVersion)</MicrosoftAspNetCoreAuthorizationPreviousPackageVersion>
@@ -126,22 +126,22 @@
126126
<_HarfBuzzSharpVersion>8.3.0.1</_HarfBuzzSharpVersion>
127127
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.e57e2a11dac4ccc72bea52939dede49816842005.1728</_SkiaSharpNativeAssetsVersion>
128128
<MicrosoftTemplateEngineTasksVersion>7.0.120</MicrosoftTemplateEngineTasksVersion>
129-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>10.0.0-prerelease.25375.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
130-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>10.0.0-prerelease.25375.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
131-
<MicrosoftDotNetXHarnessCLIVersion>10.0.0-prerelease.25375.1</MicrosoftDotNetXHarnessCLIVersion>
129+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>10.0.0-prerelease.25427.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
130+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>10.0.0-prerelease.25427.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
131+
<MicrosoftDotNetXHarnessCLIVersion>10.0.0-prerelease.25427.1</MicrosoftDotNetXHarnessCLIVersion>
132132
<TizenUIExtensionsVersion>0.9.2</TizenUIExtensionsVersion>
133133
<SvgSkiaPackageVersion>2.0.0.4</SvgSkiaPackageVersion>
134134
<FizzlerPackageVersion>1.3.0</FizzlerPackageVersion>
135135
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
136136
<ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>
137137
<SystemDrawingCommonPackageVersion>9.0.0</SystemDrawingCommonPackageVersion>
138-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25416.112</MicrosoftDotNetBuildTasksFeedVersion>
139-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25416.112</MicrosoftDotNetBuildTasksInstallersPackageVersion>
140-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25416.112</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
141-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25416.112</MicrosoftDotNetHelixSdkPackageVersion>
138+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25461.112</MicrosoftDotNetBuildTasksFeedVersion>
139+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25461.112</MicrosoftDotNetBuildTasksInstallersPackageVersion>
140+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25461.112</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
141+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25461.112</MicrosoftDotNetHelixSdkPackageVersion>
142142
<MicroBuildPluginsSwixBuildDotnetPackageVersion>1.1.87-gba258badda</MicroBuildPluginsSwixBuildDotnetPackageVersion>
143-
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25416.112</MicrosoftDotNetRemoteExecutorPackageVersion>
144-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25416.112</MicrosoftDotNetXUnitExtensionsPackageVersion>
143+
<MicrosoftDotNetRemoteExecutorPackageVersion>10.0.0-beta.25461.112</MicrosoftDotNetRemoteExecutorPackageVersion>
144+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25461.112</MicrosoftDotNetXUnitExtensionsPackageVersion>
145145
</PropertyGroup>
146146
<PropertyGroup>
147147
<MicrosoftNETTestSdkPackageVersion>17.6.0</MicrosoftNETTestSdkPackageVersion>
@@ -208,8 +208,8 @@
208208
<DotNetVersionBand Condition=" '$(DotNetPreviewVersionBand)' == '' ">$(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc|alpha).\d+`))</DotNetVersionBand>
209209
<DotNetSdkManifestsFolder>$(DotNetVersionBand)</DotNetSdkManifestsFolder>
210210
<DotNetMauiManifestVersionBand>$(DotNetVersionBand)</DotNetMauiManifestVersionBand>
211-
<DotNetAndroidManifestVersionBand>$(DotNetVersionBand)</DotNetAndroidManifestVersionBand>
212-
<DotNetMaciOSManifestVersionBand>$(DotNetVersionBand)</DotNetMaciOSManifestVersionBand>
211+
<DotNetAndroidManifestVersionBand>10.0.100-rc.1</DotNetAndroidManifestVersionBand>
212+
<DotNetMaciOSManifestVersionBand>10.0.100-rc.1</DotNetMaciOSManifestVersionBand>
213213
<DotNetTizenManifestVersionBand>9.0.100</DotNetTizenManifestVersionBand>
214214
<MicrosoftMacCatalystSdkPackageVersion>$(MicrosoftMacCatalystSdknet100_185PackageVersion)</MicrosoftMacCatalystSdkPackageVersion>
215215
<MicrosoftmacOSSdkPackageVersion>$(MicrosoftmacOSSdknet100_155PackageVersion)</MicrosoftmacOSSdkPackageVersion>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# displayName: Setup Private Feeds Credentials
1111
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1212
# inputs:
13-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
14-
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
13+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
14+
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
1515
# env:
1616
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
1717
#
@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
157157
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
158158
}
159159

160-
$dotnetVersions = @('5','6','7','8','9')
160+
$dotnetVersions = @('5','6','7','8','9','10')
161161

162162
foreach ($dotnetVersion in $dotnetVersions) {
163163
$feedPrefix = "dotnet" + $dotnetVersion;

‎eng/common/SetupNugetSources.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# - task: Bash@3
1212
# displayName: Setup Internal Feeds
1313
# inputs:
14-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
15-
# arguments: $(Build.SourcesDirectory)/NuGet.config
14+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh
15+
# arguments: $(System.DefaultWorkingDirectory)/NuGet.config
1616
# condition: ne(variables['Agent.OS'], 'Windows_NT')
1717
# - task: NuGetAuthenticate@1
1818
#
@@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
9999
PackageSources+=('dotnet3.1-internal-transport')
100100
fi
101101

102-
DotNetVersions=('5' '6' '7' '8' '9')
102+
DotNetVersions=('5' '6' '7' '8' '9' '10')
103103

104104
for DotNetVersion in ${DotNetVersions[@]} ; do
105105
FeedPrefix="dotnet${DotNetVersion}";

‎eng/common/core-templates/job/job.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
inputs:
164164
testResultsFormat: 'xUnit'
165165
testResultsFiles: '*.xml'
166-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
166+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
167167
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
168168
mergeTestResults: ${{ parameters.mergeTestResults }}
169169
continueOnError: true
@@ -174,7 +174,7 @@ jobs:
174174
inputs:
175175
testResultsFormat: 'VSTest'
176176
testResultsFiles: '*.trx'
177-
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
177+
searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)'
178178
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
179179
mergeTestResults: ${{ parameters.mergeTestResults }}
180180
continueOnError: true
@@ -218,7 +218,7 @@ jobs:
218218
- task: CopyFiles@2
219219
displayName: Gather buildconfiguration for build retry
220220
inputs:
221-
SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration'
221+
SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration'
222222
Contents: '**'
223223
TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration'
224224
continueOnError: true

0 commit comments

Comments
 (0)