Skip to content
Merged
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
3 changes: 3 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<!-- Feeds for packages built in the VMR (newly Arcade and other) -->
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
<!-- Feeds for command-line-api -->
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<!-- Feeds for source-build command-line-api intermediate -->
Expand Down
5 changes: 5 additions & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,10 @@

<UsageData>
<IgnorePatterns>
<!-- temporary until repo-level source-build is removed -->
<UsagePattern IdentityGlob="Microsoft.DotNet.Arcade.Sdk/10.0.*" />
<UsagePattern IdentityGlob="Microsoft.DotNet.Build.Tasks.Feed/10.0.*" />
<UsagePattern IdentityGlob="Microsoft.DotNet.SourceBuild.Tasks/10.0.*" />
<UsagePattern IdentityGlob="Microsoft.DotNet.XliffTasks/10.0.*" />
</IgnorePatterns>
</UsageData>
11 changes: 4 additions & 7 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="49f46ce3082f22cd016b9fffdae880a09b04afcd" BarId="262746" />
<ProductDependencies>
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.23307.1">
<Uri>https://github.com/dotnet/command-line-api</Uri>
Expand All @@ -19,13 +20,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25171.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25171.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25202.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>49f46ce3082f22cd016b9fffdae880a09b04afcd</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25171.1">
Expand Down
Empty file modified eng/common/SetupNugetSources.sh
100644 → 100755
Empty file.
3 changes: 2 additions & 1 deletion eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ function Build {
/p:PerformanceTest=$performanceTest `
/p:Sign=$sign `
/p:Publish=$publish `
/p:RestoreStaticGraphEnableBinaryLogger=$binaryLog `
@properties
}

Expand Down Expand Up @@ -171,4 +172,4 @@ catch {
ExitWithExitCode 1
}

ExitWithExitCode 0
ExitWithExitCode 0
3 changes: 2 additions & 1 deletion eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ function Build {
/p:PerformanceTest=$performance_test \
/p:Sign=$sign \
/p:Publish=$publish \
/p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
$properties

ExitWithExitCode 0
Expand All @@ -267,4 +268,4 @@ if [[ "$restore" == true ]]; then
InitializeNativeTools
fi

Build
Build
13 changes: 0 additions & 13 deletions eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ jobs:
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
- name: DOTNET_CLI_TELEMETRY_PROFILE
value: '$(Build.Repository.Uri)'
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
- name: EnableRichCodeNavigation
value: 'true'
# Retry signature validation up to three times, waiting 2 seconds between attempts.
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
Expand Down Expand Up @@ -147,16 +144,6 @@ jobs:
- ${{ each step in parameters.steps }}:
- ${{ step }}

- ${{ if eq(parameters.enableRichCodeNavigation, true) }}:
- task: RichCodeNavIndexer@0
displayName: RichCodeNav Upload
inputs:
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
continueOnError: true

- ${{ each step in parameters.componentGovernanceSteps }}:
- ${{ step }}

Expand Down
Empty file modified eng/common/cross/install-debs.py
100644 → 100755
Empty file.
Empty file modified eng/common/cross/tizen-build-rootfs.sh
100644 → 100755
Empty file.
Empty file modified eng/common/cross/tizen-fetch.sh
100644 → 100755
Empty file.
Empty file modified eng/common/generate-sbom-prep.sh
100644 → 100755
Empty file.
Empty file modified eng/common/native/install-dependencies.sh
100644 → 100755
Empty file.
Empty file modified eng/common/sdk-task.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"dotnet": "10.0.100-preview.3.25167.3"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25171.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25202.102",
"Microsoft.Build.NoTargets": "3.7.0"
}
}