Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26509.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="12.0.0-beta.26523.11">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7dad90156e9d69e991ad499ece9cf805cabcf506</Sha>
<Sha>7663bc91853be9540495d9e502f1b29a02b8be83</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="12.0.0-beta.26509.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="12.0.0-beta.26523.11">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7dad90156e9d69e991ad499ece9cf805cabcf506</Sha>
<Sha>7663bc91853be9540495d9e502f1b29a02b8be83</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="12.0.0-beta.26509.4">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="12.0.0-beta.26523.11">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7dad90156e9d69e991ad499ece9cf805cabcf506</Sha>
<Sha>7663bc91853be9540495d9e502f1b29a02b8be83</Sha>
</Dependency>
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.13.0-preview.26519.2">
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.13.0-preview.26524.1">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
<Sha>f758d3725063db472ed0353c4e0eeec86df5145d</Sha>
<Sha>b5b0f1c467af054ef1714934a4249da6a6796eaa</Sha>
</Dependency>
<Dependency Name="Microsoft.Testing.Extensions.AffectedTests" Version="18.13.0-preview.26519.2">
<Dependency Name="Microsoft.Testing.Extensions.AffectedTests" Version="18.13.0-preview.26524.1">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
<Sha>f758d3725063db472ed0353c4e0eeec86df5145d</Sha>
<Sha>b5b0f1c467af054ef1714934a4249da6a6796eaa</Sha>
</Dependency>
<Dependency Name="MSTest" Version="4.6.0-preview.26519.1">
<Uri>https://github.com/microsoft/testfx</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup Label="MSTest prod dependencies - darc updated">
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>12.0.0-beta.26509.4</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftTestingExtensionsCodeCoverageVersion>18.13.0-preview.26519.2</MicrosoftTestingExtensionsCodeCoverageVersion>
<MicrosoftTestingExtensionsAffectedTestsVersion>18.13.0-preview.26519.2</MicrosoftTestingExtensionsAffectedTestsVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>12.0.0-beta.26523.11</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftTestingExtensionsCodeCoverageVersion>18.13.0-preview.26524.1</MicrosoftTestingExtensionsCodeCoverageVersion>
<MicrosoftTestingExtensionsAffectedTestsVersion>18.13.0-preview.26524.1</MicrosoftTestingExtensionsAffectedTestsVersion>
<!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
<MSTestVersion>4.6.0-preview.26519.1</MSTestVersion>
<MicrosoftTestingPlatformVersion>2.6.0-preview.26519.1</MicrosoftTestingPlatformVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ clean=false

warn_as_error=true
warn_not_as_error=''
# Empty means "not specified"; tools.sh defaults both options on locally, and msbuild_multi_threaded on (node_reuse off) on CI.
# Empty means "not specified"; tools.sh defaults these to on for local builds and off on CI.
node_reuse=''
msbuild_multi_threaded=''
build_check=false
Expand Down
2 changes: 1 addition & 1 deletion eng/common/msbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"

verbosity='minimal'
warn_as_error=true
# Empty means "not specified"; tools.sh defaults both options on locally, and msbuild_multi_threaded on (node_reuse off) on CI.
# Empty means "not specified"; tools.sh defaults these to on for local builds and off on CI.
node_reuse=''
msbuild_multi_threaded=''
prepare_machine=false
Expand Down
2 changes: 0 additions & 2 deletions eng/common/native/NativeAotSupported.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

<!-- Reject unsupported OS via RID prefix match -->
<_NativeAotSupportedOS Condition="
'$(TargetOS)' != 'browser' and
'$(TargetOS)' != 'haiku' and
'$(TargetOS)' != 'illumos' and
'$(TargetOS)' != 'netbsd' and
Expand All @@ -12,7 +11,6 @@

<!-- Reject unsupported architectures via RID suffix match -->
<_NativeAotSupportedArch Condition="
'$(TargetArchitecture)' != 'wasm' and
'$(TargetArchitecture)' != 's390x' and
'$(TargetArchitecture)' != 'ppc64le' and
('$(TargetArchitecture)' != 'x86' or '$(TargetOS)' == 'windows')
Expand Down
2 changes: 1 addition & 1 deletion eng/common/native/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ case "$os" in
apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
libssl-dev libkrb5-dev pigz cpio ninja-build file

localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
localedef -i en_US -c -f UTF-8 en_US.UTF-8
elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then
pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)"
$pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio ninja-build file
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26509.4",
"Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26523.11",
"MSBuild.Sdk.Extras": "3.0.44"
}
}
Loading