Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #6703

Merged
merged 52 commits into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
63bfbea
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] May 22, 2023
f2e4581
Add dotnet8 nuget feed
ericstj May 25, 2023
04d8d36
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] May 29, 2023
80b44d6
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 5, 2023
7d571b5
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 12, 2023
a6d9897
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 19, 2023
827bea1
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 26, 2023
7f9de8a
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 3, 2023
47cd477
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 10, 2023
7099384
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 17, 2023
e51c1ba
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 24, 2023
5449f24
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 31, 2023
905fad9
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 7, 2023
7379ca5
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 14, 2023
9c9fa1f
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 21, 2023
b83340a
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Aug 28, 2023
8443dd7
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 4, 2023
b9cc1d7
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 11, 2023
6b79938
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 18, 2023
80a9a3a
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 25, 2023
eaa7961
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Oct 2, 2023
a60ce8b
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 9, 2023
6e6e344
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 16, 2023
3430802
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 23, 2023
0c9d25b
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 30, 2023
7661ded
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 6, 2023
178a1ba
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 13, 2023
fa24677
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 20, 2023
a308a6d
Fixed version update breaks.
michaelgsharp Nov 21, 2023
8f347e8
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 27, 2023
fd1ae96
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 4, 2023
2b15d08
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 11, 2023
2b82866
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 18, 2023
2183ea4
Merge remote-tracking branch 'upstream/main' into darc-main-4fc19a23-…
ericstj Dec 19, 2023
038f62a
Update XUnitVersion
ericstj Dec 19, 2023
9388882
Update MicrosoftMLOnnxRuntimeVersion to 1.16.3
ericstj Dec 19, 2023
d053100
Rollback OnnxRuntime and suppress warning
ericstj Dec 19, 2023
6e59f41
Update to Xunit with fix for https://github.com/xunit/xunit/issues/2821
ericstj Dec 19, 2023
807d9dc
Ensure we pull down 8.0 runtime.
ericstj Dec 19, 2023
da5f621
Update Centos docker containers
ericstj Dec 19, 2023
51b0cce
Fix packaging step
ericstj Dec 19, 2023
c0cbaa9
Try including stdint.h to fix missing uint8_t on centos
ericstj Dec 19, 2023
5fa79bc
Update Centos test queue
ericstj Dec 19, 2023
f28adef
Attempt to use runtime centos-stream8-helix container for tests
ericstj Dec 20, 2023
e585487
Use centos-stream8-mlnet-helix container for testing
ericstj Dec 20, 2023
4a404f3
Undo changes to test data
ericstj Dec 22, 2023
75b3706
Make NETFRAMEWORK ifdef versionless
ericstj Dec 22, 2023
c47e345
Merge remote-tracking branch 'upstream/main' into darc-main-4fc19a23-…
ericstj Dec 22, 2023
ab0d41e
Switch back to centos7 for testing
ericstj Dec 22, 2023
56511ac
Revert "Switch back to centos7 for testing"
ericstj Dec 22, 2023
27b544f
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 25, 2023
501826e
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Jan 1, 2024
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 @@ -13,6 +13,7 @@
<add key="dotnet5-roslyn" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
<add key="mlnet-daily" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json" />
<add key="mlnet-assets" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/machinelearning-assets/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23265.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23279.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
<Sha>174c08a43b26fc26ba98975065f1125f910f5c37</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23265.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23279.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
<Sha>174c08a43b26fc26ba98975065f1125f910f5c37</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23265.1">
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23279.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
<Sha>174c08a43b26fc26ba98975065f1125f910f5c37</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23265.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23279.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
<Sha>174c08a43b26fc26ba98975065f1125f910f5c37</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23265.1">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23279.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
<Sha>174c08a43b26fc26ba98975065f1125f910f5c37</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
Expand All @@ -39,9 +39,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23265.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23279.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d8d59065b5e090584a8e90c4371fc06ed60bdc5</Sha>
<Sha>174c08a43b26fc26ba98975065f1125f910f5c37</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<DotNetRuntime80Version>8.0.0-preview.3.23174.8</DotNetRuntime80Version>
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23265.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23279.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down
12 changes: 8 additions & 4 deletions eng/common/templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ jobs:
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
- name: EnableRichCodeNavigation
value: 'true'
# Retry signature validation up to three times, waiting 2 seconds between attempts.
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
value: 3,2000
- ${{ each variable in parameters.variables }}:
# handle name-value variable syntax
# example:
Expand All @@ -83,7 +87,7 @@ jobs:
- ${{ if ne(variable.name, '') }}:
- name: ${{ variable.name }}
value: ${{ variable.value }}

# handle variable groups
- ${{ if ne(variable.group, '') }}:
- group: ${{ variable.group }}
Expand Down Expand Up @@ -169,7 +173,7 @@ jobs:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: MicroBuildCleanup@1
displayName: Execute Microbuild cleanup tasks
displayName: Execute Microbuild cleanup tasks
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
continueOnError: ${{ parameters.continueOnError }}
env:
Expand Down Expand Up @@ -219,7 +223,7 @@ jobs:
displayName: Publish XUnit Test Results
inputs:
testResultsFormat: 'xUnit'
testResultsFiles: '*.xml'
testResultsFiles: '*.xml'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
mergeTestResults: ${{ parameters.mergeTestResults }}
Expand All @@ -230,7 +234,7 @@ jobs:
displayName: Publish TRX Test Results
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '*.trx'
testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
mergeTestResults: ${{ parameters.mergeTestResults }}
Expand Down
6 changes: 6 additions & 0 deletions eng/common/templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ steps:
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
fi

baseOsArgs=
if [ '${{ parameters.platform.baseOS }}' != '' ]; then
baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
fi

publishArgs=
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
publishArgs='--publish'
Expand All @@ -86,6 +91,7 @@ steps:
$internalRestoreArgs \
$targetRidArgs \
$runtimeOsArgs \
$baseOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true \
/p:AssetManifestFileName=$assetManifestFileName
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview
$defaultXCopyMSBuildVersion = '17.4.1'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2
$defaultXCopyMSBuildVersion = '17.6.0-2'

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "8.0.100-preview.3.23178.7",
"dotnet": "8.0.100-preview.4.23260.5",
"runtimes": {
"dotnet/x64": [
"$(DotNetRuntime60Version)"
Expand All @@ -11,8 +11,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23265.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23265.1",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23279.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23279.1",
"Microsoft.Build.Traversal": "3.2.0",
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"
Expand Down