Skip to content

Commit d893ad5

Browse files
[main] Source code updates from dotnet/dotnet (#1401)
[main] Source code updates from dotnet/dotnet - Add dotnet10-transport feed to NuGet.config - Add dotnet10 feed to NuGet.config - Revert System.CommandLine update and remove xliff tasks - Add arcade packages to SourceBuildPrebuiltBaseline.xml
1 parent ccdd470 commit d893ad5

14 files changed

+17
-23
lines changed

NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
66
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
77
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
8+
<!-- Feeds for packages built in the VMR (newly Arcade and other) -->
9+
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
10+
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
811
<!-- Feeds for command-line-api -->
912
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
1013
<!-- Feeds for source-build command-line-api intermediate -->

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,10 @@
33

44
<UsageData>
55
<IgnorePatterns>
6+
<!-- temporary until repo-level source-build is removed -->
7+
<UsagePattern IdentityGlob="Microsoft.DotNet.Arcade.Sdk/10.0.*" />
8+
<UsagePattern IdentityGlob="Microsoft.DotNet.Build.Tasks.Feed/10.0.*" />
9+
<UsagePattern IdentityGlob="Microsoft.DotNet.SourceBuild.Tasks/10.0.*" />
10+
<UsagePattern IdentityGlob="Microsoft.DotNet.XliffTasks/10.0.*" />
611
</IgnorePatterns>
712
</UsageData>

eng/Version.Details.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="49f46ce3082f22cd016b9fffdae880a09b04afcd" BarId="262746" />
34
<ProductDependencies>
45
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.23307.1">
56
<Uri>https://github.com/dotnet/command-line-api</Uri>
@@ -19,13 +20,9 @@
1920
</Dependency>
2021
</ProductDependencies>
2122
<ToolsetDependencies>
22-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25171.1">
23-
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
25-
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25171.1">
27-
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
23+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25202.102">
24+
<Uri>https://github.com/dotnet/dotnet</Uri>
25+
<Sha>49f46ce3082f22cd016b9fffdae880a09b04afcd</Sha>
2926
</Dependency>
3027
<!-- Intermediate is necessary for source build. -->
3128
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25171.1">

eng/common/SetupNugetSources.sh

100644100755
File mode changed.

eng/common/build.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ function Build {
132132
/p:PerformanceTest=$performanceTest `
133133
/p:Sign=$sign `
134134
/p:Publish=$publish `
135+
/p:RestoreStaticGraphEnableBinaryLogger=$binaryLog `
135136
@properties
136137
}
137138

@@ -171,4 +172,4 @@ catch {
171172
ExitWithExitCode 1
172173
}
173174

174-
ExitWithExitCode 0
175+
ExitWithExitCode 0

eng/common/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ function Build {
250250
/p:PerformanceTest=$performance_test \
251251
/p:Sign=$sign \
252252
/p:Publish=$publish \
253+
/p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
253254
$properties
254255

255256
ExitWithExitCode 0
@@ -267,4 +268,4 @@ if [[ "$restore" == true ]]; then
267268
InitializeNativeTools
268269
fi
269270

270-
Build
271+
Build

eng/common/core-templates/job/job.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ jobs:
7373
- ${{ if ne(parameters.enableTelemetry, 'false') }}:
7474
- name: DOTNET_CLI_TELEMETRY_PROFILE
7575
value: '$(Build.Repository.Uri)'
76-
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
77-
- name: EnableRichCodeNavigation
78-
value: 'true'
7976
# Retry signature validation up to three times, waiting 2 seconds between attempts.
8077
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
8178
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
@@ -147,16 +144,6 @@ jobs:
147144
- ${{ each step in parameters.steps }}:
148145
- ${{ step }}
149146

150-
- ${{ if eq(parameters.enableRichCodeNavigation, true) }}:
151-
- task: RichCodeNavIndexer@0
152-
displayName: RichCodeNav Upload
153-
inputs:
154-
languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
155-
environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
156-
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
157-
uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
158-
continueOnError: true
159-
160147
- ${{ each step in parameters.componentGovernanceSteps }}:
161148
- ${{ step }}
162149

eng/common/cross/install-debs.py

100644100755
File mode changed.

eng/common/cross/tizen-build-rootfs.sh

100644100755
File mode changed.

eng/common/cross/tizen-fetch.sh

100644100755
File mode changed.

eng/common/generate-sbom-prep.sh

100644100755
File mode changed.

eng/common/native/install-dependencies.sh

100644100755
File mode changed.

eng/common/sdk-task.sh

100644100755
File mode changed.

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "10.0.100-preview.3.25167.3"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25171.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25202.102",
77
"Microsoft.Build.NoTargets": "3.7.0"
88
}
99
}

0 commit comments

Comments
 (0)