Skip to content

Commit f4a204a

Browse files
authored
Merge branch 'release/10.0.1xx' into update-man-page-2025-09-01
2 parents 19fa9d3 + 6b52b29 commit f4a204a

File tree

196 files changed

+6440
-3734
lines changed

Some content is hidden

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

196 files changed

+6440
-3734
lines changed

Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@
108108

109109
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
110110
<SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>
111+
112+
<MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' != 'true'">3.11.0</MicrosoftCodeAnalysisVersionForNetAnalyzers>
113+
<MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersionForNetAnalyzers>
111114
</PropertyGroup>
112115

113116
<Import Project="build/GenerateResxSource.targets" />

documentation/general/decouple-vs-and-net-sdk.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,17 +133,21 @@ To mitigate this we will be fixing the `build-server shutdown` command to be rel
133133

134134
## RoslynCompilerType
135135

136-
Based on the value of the `RoslynCompilerType` property, the SDK sets property `RoslynTasksAssembly` to a full path to a [Roslyn build task DLL][roslyn-build-task],
137-
and the SDK targets use `$(RoslynTasksAssembly)` to load the build task.
138-
139-
The SDK also sets `RoslynTargetsPath` to the directory path of the roslyn tasks assembly. This property is used by some targets
140-
but it should be avoided if possible because the tasks assembly name can change as well, not just the directory path.
136+
Based on the value of the `RoslynCompilerType` property, the SDK (or compiler toolset packages) set the following properties:
137+
- `RoslynTasksAssembly` to a full path to a [Roslyn build task DLL][roslyn-build-task],
138+
and the SDK targets use `$(RoslynTasksAssembly)` to load the build task
139+
- `RoslynTargetsPath` to the directory path of the roslyn tasks assembly. This property is used by some targets
140+
but it should be avoided if possible because the tasks assembly name can change as well, not just the directory path.
141+
This property is a misnomer for historical reasons, it really points to _tasks_, there is no guarantee there will be any _targets_ in the directory.
142+
- `RoslynAssembliesPath` to the directory path of other roslyn assemblies (like `Microsoft.CodeAnalysis.dll`).
143+
In builds using .NET Framework MSBuild, the path is set to the Roslyn directory that ships with MSBuild (no .NET Framework Roslyn assemblies ship with the .NET SDK).
144+
- `RoslynCoreAssembliesPath` to the directory path of other roslyn assemblies which target .NET Core regardless of the host being .NET Framework or Core MSBuild.
141145

142146
These values are recognized for property `RoslynCompilerType`:
143147
- `Core`: use the compiler that comes with the .NET SDK
144148
- `Framework`: use the compiler that comes with .NET Framework MSBuild
145149
- `FrameworkPackage`: download the Microsoft.Net.Sdk.Compilers.Toolset package which contains the .NET Framework compiler corresponding to the .NET SDK version
146-
- `Custom`: the SDK will not override `RoslynTasksAssembly` - used for example by Microsoft.Net.Compilers.Toolset package which injects its own version of the build task
150+
- `Custom`: the SDK will not override `RoslynTasksAssembly` and the other properties listed above - used for example by Microsoft.Net.Compilers.Toolset package which injects its own version of the build task
147151

148152
## Alternative
149153

eng/Version.Details.props

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

eng/Version.Details.xml

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

eng/Versions.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@
6565
<SystemCommandLineVersion>2.0.0-rc.1.25377.103</SystemCommandLineVersion>
6666
<SystemCommandLineNamingConventionBinderVersion>2.0.0-beta5.25279.2</SystemCommandLineNamingConventionBinderVersion>
6767
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2</MicrosoftCodeAnalysisAnalyzerTestingVersion>
68-
<MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' != 'true'">3.11.0</MicrosoftCodeAnalysisVersionForNetAnalyzers>
69-
<MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersionForNetAnalyzers>
7068
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
7169
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
7270
<MicrosoftWindowsCsWin32PackageVersion>0.3.49-beta</MicrosoftWindowsCsWin32PackageVersion>

eng/common/core-templates/steps/source-index-stage1-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
2-
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
3-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1
2+
sourceIndexUploadPackageVersion: 2.0.0-20250818.1
3+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
binlogPath: artifacts/log/Debug/Build.binlog
66

eng/common/sdk-task.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ Param(
77
[switch] $restore,
88
[switch] $prepareMachine,
99
[switch][Alias('nobl')]$excludeCIBinaryLog,
10+
[switch]$noWarnAsError,
1011
[switch] $help,
1112
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
1213
)
1314

1415
$ci = $true
1516
$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
16-
$warnAsError = $true
17+
$warnAsError = if ($noWarnAsError) { $false } else { $true }
1718

1819
. $PSScriptRoot\tools.ps1
1920

eng/common/sdk-task.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ show_usage() {
1010

1111
echo "Advanced settings:"
1212
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
13+
echo " --noWarnAsError Do not warn as error
1314
echo ""
1415
echo "Command line arguments not listed above are passed thru to msbuild."
1516
}
@@ -52,6 +53,7 @@ exclude_ci_binary_log=false
5253
restore=false
5354
help=false
5455
properties=''
56+
warnAsError=true
5557
5658
while (($# > 0)); do
5759
lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
@@ -73,6 +75,10 @@ while (($# > 0)); do
7375
exclude_ci_binary_log=true
7476
shift 1
7577
;;
78+
--noWarnAsError)
79+
warnAsError=false
80+
shift 1
81+
;;
7682
--help)
7783
help=true
7884
shift 1
@@ -85,7 +91,6 @@ while (($# > 0)); do
8591
done
8692
8793
ci=true
88-
warnAsError=true
8994
9095
if $help; then
9196
show_usage

eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){
553553

554554
if (!(Test-Path $vsWhereExe)) {
555555
Create-Directory $vsWhereDir
556-
Write-Host 'Downloading vswhere $vswhereVersion'
556+
Write-Host "Downloading vswhere $vswhereVersion"
557557
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
558558
Retry({
559559
Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
88
},
99
"tools": {
10-
"dotnet": "10.0.100-rc.1.25411.109",
10+
"dotnet": "10.0.100-rc.1.25420.111",
1111
"runtimes": {
1212
"dotnet": [
1313
"$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,8 +21,8 @@
2121
}
2222
},
2323
"msbuild-sdks": {
24-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.109",
25-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.109",
24+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104",
25+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25427.104",
2626
"Microsoft.Build.NoTargets": "3.7.0",
2727
"Microsoft.Build.Traversal": "3.4.0",
2828
"Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

0 commit comments

Comments
 (0)