Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
4 changes: 0 additions & 4 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
</disabledPackageSources>
<packageSourceMapping>
<clear />

<packageSource key="dotnet-public">
<package pattern="BasicUndo" />
<package pattern="Castle.Core" />
Expand Down Expand Up @@ -74,7 +73,6 @@
<package pattern="vswhere" />
<package pattern="xunit.*" />
</packageSource>

<packageSource key="dotnet-eng">
<package pattern="MicroBuild.Core.Sentinel" />
<package pattern="Microsoft.DiaSymReader.Pdb2Pdb" />
Expand All @@ -90,12 +88,10 @@
<package pattern="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" />
<package pattern="sn" />
</packageSource>

<packageSource key="vssdk">
<package pattern="Microsoft.VisualStudio.Interop" />
<package pattern="StreamJsonRpc" />
</packageSource>

<packageSource key="vs-impl">
<package pattern="Microsoft.VisualStudio.Platform.VSEditor" />
<package pattern="Microsoft.VisualStudio.Text.Internal" />
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25415.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25460.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 4 additions & 0 deletions eng/common/core-templates/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ parameters:
# container and pool.
platform: {}

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

is1ESPipeline: ''

# If set to true and running on a non-public project,
Expand Down Expand Up @@ -93,3 +96,4 @@ jobs:
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
platform: ${{ parameters.platform }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
5 changes: 5 additions & 0 deletions eng/common/core-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.
componentGovernanceIgnoreDirectories: []

is1ESPipeline: ''

# If set to true and running on a non-public project,
Expand All @@ -47,6 +50,7 @@ jobs:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ platform }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}

- ${{ if eq(length(parameters.platforms), 0) }}:
Expand All @@ -55,4 +59,5 @@ jobs:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ parameters.defaultManagedPlatform }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}
9 changes: 8 additions & 1 deletion eng/common/core-templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ parameters:
# for details. The entire object is described in the 'job' template for simplicity, even though
# 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.
componentGovernanceIgnoreDirectories: []

is1ESPipeline: false

steps:
Expand Down Expand Up @@ -126,5 +130,8 @@ steps:
parameters:
displayName: Component Detection (Exclude upstream cache)
is1ESPipeline: ${{ parameters.is1ESPipeline }}
componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}:
componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
${{ else }}:
componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }}
disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"tools": {
"dotnet": "9.0.109",
"dotnet": "9.0.110",
"vs": {
"version": "17.8.0"
}
},
"sdk": {
"version": "9.0.109",
"version": "9.0.110",
"rollForward": "latestFeature"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1"
}
}
Loading