Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e7aaa29
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Aug 23, 2025
0ce8947
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Aug 28, 2025
9e55186
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Sep 6, 2025
a336a66
Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-a685560a-af8…
SimonZhao888 Sep 9, 2025
fd06e1b
Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-a685560a-af8…
SimonZhao888 Sep 12, 2025
e938092
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Sep 12, 2025
03622f3
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Sep 13, 2025
8f22068
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Sep 14, 2025
8f81d08
Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-a685560a-af8…
SimonZhao888 Sep 15, 2025
8392422
Added nowarn for NETSDK1138.
MiYanni Sep 15, 2025
2fe808a
Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-a685560a-af8…
SimonZhao888 Sep 16, 2025
3d1cb71
Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-a685560a-af8…
SimonZhao888 Sep 16, 2025
15921ef
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Sep 16, 2025
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
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -491,22 +491,22 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25415.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25455.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
<Sha>09625cb3b98ebe646a63dfea19a0c0127e88459a</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25415.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25455.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
<Sha>09625cb3b98ebe646a63dfea19a0c0127e88459a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25415.2">
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25455.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
<Sha>09625cb3b98ebe646a63dfea19a0c0127e88459a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25415.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25455.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596</Sha>
<Sha>09625cb3b98ebe646a63dfea19a0c0127e88459a</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25415.2</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25455.3</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
Expand Down Expand Up @@ -211,7 +211,7 @@
<PropertyGroup>
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25415.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25455.3</MicrosoftDotNetXUnitExtensionsVersion>
<MoqPackageVersion>4.18.4</MoqPackageVersion>
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
Expand Down
4 changes: 4 additions & 0 deletions eng/common/templates-official/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ parameters:
# container and pool.
platform: {}

# Optional list of directories to ignore for component governance scans.
cgIgnoreDirectories: []

# If set to true and running on a non-public project,
# Internal blob storage locations will be enabled.
# This is not enabled by default because many repositories do not need internal sources
Expand Down Expand Up @@ -73,3 +76,4 @@ jobs:
- template: /eng/common/templates-official/steps/source-build.yml
parameters:
platform: ${{ parameters.platform }}
cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
5 changes: 5 additions & 0 deletions eng/common/templates-official/jobs/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ parameters:
# one job runs on 'defaultManagedPlatform'.
platforms: []

# Optional list of directories to ignore for component governance scans.
cgIgnoreDirectories: []

# If set to true and running on a non-public project,
# Internal nuget and blob storage locations will be enabled.
# This is not enabled by default because many repositories do not need internal sources
Expand All @@ -44,11 +47,13 @@ jobs:
parameters:
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ platform }}
cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}

- ${{ if eq(length(parameters.platforms), 0) }}:
- template: /eng/common/templates-official/job/source-build.yml
parameters:
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ parameters.defaultManagedPlatform }}
cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}
8 changes: 7 additions & 1 deletion eng/common/templates-official/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ parameters:
# the usage of the properties on this object is split between the 'job' and 'steps' templates.
platform: {}

# Optional list of directories to ignore for component governance scans.
cgIgnoreDirectories: []

steps:
# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.)
- script: |
Expand Down Expand Up @@ -126,4 +129,7 @@ steps:
- task: ComponentGovernanceComponentDetection@0
displayName: Component Detection (Exclude upstream cache)
inputs:
ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}:
ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
${{ else }}:
ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }}
4 changes: 4 additions & 0 deletions eng/common/templates/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ parameters:
# container and pool.
platform: {}

# Optional list of directories to ignore for component governance scans.
cgIgnoreDirectories: []

# If set to true and running on a non-public project,
# Internal blob storage locations will be enabled.
# This is not enabled by default because many repositories do not need internal sources
Expand Down Expand Up @@ -72,3 +75,4 @@ jobs:
- template: /eng/common/templates/steps/source-build.yml
parameters:
platform: ${{ parameters.platform }}
cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
5 changes: 5 additions & 0 deletions eng/common/templates/jobs/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ parameters:
# one job runs on 'defaultManagedPlatform'.
platforms: []

# Optional list of directories to ignore for component governance scans.
cgIgnoreDirectories: []

# If set to true and running on a non-public project,
# Internal nuget and blob storage locations will be enabled.
# This is not enabled by default because many repositories do not need internal sources
Expand All @@ -44,11 +47,13 @@ jobs:
parameters:
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ platform }}
cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}

- ${{ if eq(length(parameters.platforms), 0) }}:
- template: /eng/common/templates/job/source-build.yml
parameters:
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ parameters.defaultManagedPlatform }}
cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}
8 changes: 7 additions & 1 deletion eng/common/templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ parameters:
# the usage of the properties on this object is split between the 'job' and 'steps' templates.
platform: {}

# Optional list of directories to ignore for component governance scans.
cgIgnoreDirectories: []

steps:
# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.)
- script: |
Expand Down Expand Up @@ -126,4 +129,7 @@ steps:
- task: ComponentGovernanceComponentDetection@0
displayName: Component Detection (Exclude upstream cache)
inputs:
ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}:
ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
${{ else }}:
ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }}
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25415.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25415.2"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25455.3",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25455.3"
}
}
Loading