Skip to content

Commit 23f91eb

Browse files
Merging main into darc-main-6a483e62-9a15-475d-a31b-7c7d1c96cb9f
2 parents 6eedc45 + 497f334 commit 23f91eb

File tree

90 files changed

+3391
-679
lines changed

Some content is hidden

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

90 files changed

+3391
-679
lines changed

Directory.Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@
8888
<!-- These aliases need to live outside of Versions.props as VMR / source-build overwrites some of the version properties for live builds. -->
8989
<PropertyGroup>
9090
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
91-
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppHostwinx64PackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
92-
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
93-
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
94-
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
91+
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
92+
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
93+
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
94+
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRefPackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
9595

9696
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
9797
<SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>

Directory.Build.targets

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,33 @@
7878
</KnownFrameworkReference>
7979
</ItemGroup>
8080

81+
<!--
82+
Common content for all SDK source packages.
83+
-->
84+
85+
<PropertyGroup Condition="'$(IsSourcePackage)' == 'true'">
86+
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddEditorConfigToSourcePackage;_AddLinkedCompileItemsToSourcePackage</TargetsForTfmSpecificContentInPackage>
87+
<PackageDescription>
88+
$(PackageDescription)
89+
90+
The source code included in this package is subject to arbitrary changes in future versions.
91+
Updating a reference to this package to a newer version of the package may require changes in the referencing project.
92+
No compatibility guarantees are provided.
93+
</PackageDescription>
94+
</PropertyGroup>
95+
96+
<!-- Include SourcePackage.editorconfig in all source packages. -->
97+
<Target Name="_AddEditorConfigToSourcePackage">
98+
<ItemGroup>
99+
<TfmSpecificPackageFile Include="$(MSBuildThisFileDirectory)eng\SourcePackage.editorconfig" PackagePath="contentFiles/cs/$(TargetFramework)/.editorconfig" />
100+
</ItemGroup>
101+
</Target>
102+
103+
<!-- Include linked files. Arcade SDK only includes files in the project directory. -->
104+
<Target Name="_AddLinkedCompileItemsToSourcePackage">
105+
<ItemGroup>
106+
<TfmSpecificPackageFile Include="@(Compile)" Condition="'%(Compile.Link)' != ''" PackagePath="contentFiles/cs/$(TargetFramework)/%(Compile.Link)" BuildAction="Compile"/>
107+
</ItemGroup>
108+
</Target>
109+
81110
</Project>

eng/SourcePackage.editorconfig

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Remove the line below if you want to inherit .editorconfig settings from higher directories
2+
root = true
3+
4+
# C# files
5+
[*.cs]
6+
7+
# We don't want any analyzer diagnostics to be reported for people consuming this as a source package.
8+
dotnet_analyzer_diagnostic.severity = none
9+
10+
generated_code = true
11+
12+
# The above configurations don't apply to compiler warnings. Requiring all params to be documented
13+
# is not something we require for this project, so suppressing it directly here.
14+
dotnet_diagnostic.CS1573.severity = none
15+
16+
# As above, we need to specifically disable compiler warnings that we don't want to break downstream
17+
# builds
18+
dotnet_diagnostic.IDE0005.severity = none

eng/Version.Details.xml

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

eng/Versions.props

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

eng/common/sdl/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.199.0"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
44
</packages>

eng/common/tools.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ $ErrorActionPreference = 'Stop'
6868
# True if the build is a product build
6969
[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }
7070

71-
[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() }
72-
7371
function Create-Directory ([string[]] $path) {
7472
New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
7573
}
@@ -853,7 +851,7 @@ function MSBuild-Core() {
853851

854852
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
855853
# Skip this when the build is a child of the VMR orchestrator build.
856-
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) {
854+
if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) {
857855
Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed."
858856
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
859857
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

eng/common/tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ function MSBuild-Core {
507507

508508
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
509509
# Skip this when the build is a child of the VMR orchestrator build.
510-
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then
510+
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then
511511
Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
512512
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
513513
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

github-merge-flow.jsonc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@
1616
"MergeToBranch": "release/9.0.1xx",
1717
"ExtraSwitches": "-QuietComments"
1818
},
19-
// Automate opening PRs to merge sdk repos from release/9.0.1xx to release/9.0.2xx
19+
// Automate opening PRs to merge sdk repos from release/9.0.1xx to release/9.0.3xx
2020
"release/9.0.1xx":{
21-
"MergeToBranch": "release/9.0.2xx",
22-
"ExtraSwitches": "-QuietComments"
23-
},
24-
// Automate opening PRs to merge sdk repos from release/9.0.2xx to release/9.0.3xx
25-
"release/9.0.2xx":{
2621
"MergeToBranch": "release/9.0.3xx",
2722
"ExtraSwitches": "-QuietComments"
2823
},

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "10.0.100-preview.3.25201.16",
44
"runtimes": {
55
"dotnet": [
6-
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
6+
"$(MicrosoftNETCorePlatformsPackageVersion)"
77
],
88
"aspnetcore": [
99
"$(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion)"
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25263.108",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25263.108",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25265.101",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25265.101",
1919
"Microsoft.Build.NoTargets": "3.7.0",
2020
"Microsoft.Build.Traversal": "3.4.0"
2121
}

0 commit comments

Comments
 (0)