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.

Sign up for GitHub

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 dotnet/xharness dotnet/runtime-assets #50231

Merged
merged 4 commits into from
Mar 25, 2021
Merged

[main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/runtime-assets #50231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b36e95a
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Mar 25, 2021
dc0ad1c
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Mar 25, 2021
37e8fca
Update dependencies from https://github.com/dotnet/runtime-assets bui…
dotnet-maestro[bot] Mar 25, 2021
2fd9cf2
Re-introduce publishing workaround
riarenas Mar 25, 2021
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 .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.21173.1",
"version": "1.0.0-prerelease.21175.2",
"commands": [
"xharness"
]
Expand Down
112 changes: 56 additions & 56 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,69 +6,69 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21167.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21173.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>91c8909b64fc346c7a44384a10ee9a45a7e3455d</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand All @@ -94,41 +94,41 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.21162.1">
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.21174.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>f01b1fca0c9157a16ade2629eb7d49a220b7e9ba</Sha>
<Sha>055ed026132a7070e41629cfb5e410f0fcbdf948</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.21172.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -198,17 +198,17 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>2f5594e95e1a5227103b9b7d6b92f4b2250be2d7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21173.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21175.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>bb960200cb1f171f11ecd8cf9e45d97218e2241e</Sha>
<Sha>f4d7df9189d3b8ab04c6ba9a94dc8ccff255224e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21173.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21175.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>bb960200cb1f171f11ecd8cf9e45d97218e2241e</Sha>
<Sha>f4d7df9189d3b8ab04c6ba9a94dc8ccff255224e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageValidation" Version="6.0.0-beta.21167.3">
<Dependency Name="Microsoft.DotNet.PackageValidation" Version="6.0.0-beta.21175.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
<Sha>12a2bc501ce756c9522588d88583c0256297bd70</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
48 changes: 24 additions & 24 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.9.0-5.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisCSharpVersion>3.9.0-5.final</MicrosoftCodeAnalysisCSharpVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21167.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21167.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21167.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21167.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21167.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21167.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21167.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21167.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21167.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21173.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21167.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21167.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageValidationVersion>6.0.0-beta.21167.3</MicrosoftDotNetPackageValidationVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21175.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21175.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21175.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21175.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21175.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21175.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21175.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21175.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21175.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21175.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21175.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21175.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageValidationVersion>6.0.0-beta.21175.1</MicrosoftDotNetPackageValidationVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -107,15 +107,15 @@
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
<runtimenativeSystemIOPortsVersion>6.0.0-preview.3.21169.6</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.21162.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>6.0.0-beta.21162.1</SystemDrawingCommonTestDataVersion>
<SystemIOCompressionTestDataVersion>6.0.0-beta.21162.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>6.0.0-beta.21162.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>6.0.0-beta.21162.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.21162.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.21162.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21162.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21162.1</SystemWindowsExtensionsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.21174.2</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>6.0.0-beta.21174.2</SystemDrawingCommonTestDataVersion>
<SystemIOCompressionTestDataVersion>6.0.0-beta.21174.2</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>6.0.0-beta.21174.2</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>6.0.0-beta.21174.2</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.21174.2</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.21174.2</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21174.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21174.2</SystemWindowsExtensionsTestDataVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>99.99.99-master-20210317.2</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>99.99.99-master-20210317.2</optimizationwindows_ntx86MIBCRuntimeVersion>
Expand Down Expand Up @@ -148,8 +148,8 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21173.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21173.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21175.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21175.2</MicrosoftDotNetXHarnessCLIVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
Expand Down
4 changes: 2 additions & 2 deletions eng/common/generate-locproject.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ $locJson = @{
}

$json = ConvertTo-Json $locJson -Depth 5
Write-Host "(NETCORE_ENGINEERING_TELEMETRY=Build) LocProject.json generated:`n`n$json`n`n"
Write-Host "LocProject.json generated:`n`n$json`n`n"
Pop-Location

if (!$UseCheckedInLocProjectJson) {
Expand All @@ -91,7 +91,7 @@ else {
Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json

if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) {
Write-PipelineTaskError -Type "warning" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."

exit 1
}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ steps:

${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
--configuration $buildConfig \
--restore --build --pack --publish \
--restore --build --pack --publish -bl \
$officialBuildArgs \
$targetRidArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21167.3",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21167.3",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21167.3",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21167.3",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21175.1",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21175.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21175.1",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21175.1",
"Microsoft.Build.NoTargets": "2.0.17",
"Microsoft.Build.Traversal": "2.1.1",
"Microsoft.NET.Sdk.IL": "6.0.0-preview.3.21169.6"
Expand Down