Skip to content

Commit 01fb989

Browse files
hoyosjshoyosjs
committed
Merge remote-tracking branch 'origin/main' into juhoyosa/merge-main
2 parents d7b455b + 3272544 commit 01fb989

34 files changed

Lines changed: 467 additions & 430 deletions

‎documentation/design-docs/ipc-protocol.md‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ enum class ProcessCommandId : uint8_t
324324
ProcessInfo2 = 0x04,
325325
EnablePerfMap = 0x05,
326326
DisablePerfMap = 0x06,
327-
ApplyStartupHook = 0x07
327+
ApplyStartupHook = 0x07,
328328
ProcessInfo3 = 0x08,
329329
// future
330330
}
@@ -1327,6 +1327,50 @@ struct Payload
13271327

13281328
> Available since .NET 6.0
13291329

1330+
### `SetEnvironmentVariable`
1331+
1332+
Command Code: `0x0403`
1333+
1334+
The `SetEnvironmentVariable` command sets an environment variable in the runtime process.
1335+
1336+
In the event of an [error](#Errors), the runtime will attempt to send an error message and subsequently close the connection.
1337+
1338+
#### Inputs:
1339+
1340+
Header: `{ Magic; Size; 0x0403; 0x0000 }`
1341+
1342+
Payload:
1343+
* `string name`: The environment variable name to set.
1344+
* `string value`: The value to assign.
1345+
1346+
#### Returns (as an IPC Message Payload):
1347+
1348+
Header: `{ Magic; size; 0xFF00; 0x0000; }`
1349+
1350+
`SetEnvironmentVariable` returns:
1351+
* `int32 hresult`: The result of setting the environment variable (`0` indicates success)
1352+
1353+
##### Details:
1354+
1355+
Input:
1356+
```c
1357+
Payload
1358+
{
1359+
string name
1360+
string value
1361+
}
1362+
```
1363+
1364+
Returns:
1365+
```c
1366+
Payload
1367+
{
1368+
int32 hresult
1369+
}
1370+
```
1371+
1372+
> Available since .NET 6.0
1373+
13301374
### `ProcessInfo2`
13311375

13321376
Command Code: `0x0404`

‎eng/Version.Details.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,23 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- microsoft/clrmd dependencies -->
9-
<MicrosoftDiagnosticsRuntimePackageVersion>4.0.0-beta.25610.1</MicrosoftDiagnosticsRuntimePackageVersion>
10-
<MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>4.0.0-beta.25610.1</MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>
9+
<MicrosoftDiagnosticsRuntimePackageVersion>4.0.0-beta.26072.1</MicrosoftDiagnosticsRuntimePackageVersion>
10+
<MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>4.0.0-beta.26072.1</MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>
1111
<!-- dotnet/command-line-api dependencies -->
1212
<SystemCommandLinePackageVersion>2.0.0-beta5.25210.1</SystemCommandLinePackageVersion>
1313
<!-- dotnet/android dependencies -->
1414
<XamarinAndroidToolsAndroidSdkPackageVersion>1.0.105-preview.225</XamarinAndroidToolsAndroidSdkPackageVersion>
15+
<!-- dotnet/arcade dependencies -->
16+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26066.3</MicrosoftDotNetArcadeSdkPackageVersion>
17+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.26066.3</MicrosoftDotNetCodeAnalysisPackageVersion>
18+
<MicrosoftDotNetRemoteExecutorPackageVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorPackageVersion>
1519
<!-- dotnet/dotnet dependencies -->
1620
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.2</MicrosoftAspNetCoreAppRefPackageVersion>
1721
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.2-servicing.25603.103</MicrosoftAspNetCoreAppRefInternalPackageVersion>
1822
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25603.103</MicrosoftCodeAnalysisPackageVersion>
1923
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-2.25603.103</MicrosoftCodeAnalysisAnalyzersPackageVersion>
2024
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25603.103</MicrosoftCodeAnalysisCSharpPackageVersion>
2125
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>10.0.102</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
22-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25603.103</MicrosoftDotNetArcadeSdkPackageVersion>
23-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25603.103</MicrosoftDotNetCodeAnalysisPackageVersion>
2426
<MicrosoftNETSdkPackageVersion>10.0.102-servicing.25603.103</MicrosoftNETSdkPackageVersion>
2527
<MicrosoftNETCoreAppRefPackageVersion>10.0.2</MicrosoftNETCoreAppRefPackageVersion>
2628
<MicrosoftNETCorePlatformsPackageVersion>10.0.2-servicing.25603.103</MicrosoftNETCorePlatformsPackageVersion>
@@ -30,8 +32,6 @@ This file should be imported by eng/Versions.props
3032
<runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>
3133
<runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
3234
<runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>10.0.2-servicing.25603.103</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
33-
<!-- dotnet/arcade dependencies -->
34-
<MicrosoftDotNetRemoteExecutorPackageVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorPackageVersion>
3535
</PropertyGroup>
3636
<!--Property group for alternate package version names-->
3737
<PropertyGroup>
@@ -42,15 +42,17 @@ This file should be imported by eng/Versions.props
4242
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
4343
<!-- dotnet/android dependencies -->
4444
<XamarinAndroidToolsAndroidSdkVersion>$(XamarinAndroidToolsAndroidSdkPackageVersion)</XamarinAndroidToolsAndroidSdkVersion>
45+
<!-- dotnet/arcade dependencies -->
46+
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
47+
<MicrosoftDotNetCodeAnalysisVersion>$(MicrosoftDotNetCodeAnalysisPackageVersion)</MicrosoftDotNetCodeAnalysisVersion>
48+
<MicrosoftDotNetRemoteExecutorVersion>$(MicrosoftDotNetRemoteExecutorPackageVersion)</MicrosoftDotNetRemoteExecutorVersion>
4549
<!-- dotnet/dotnet dependencies -->
4650
<MicrosoftAspNetCoreAppRefVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</MicrosoftAspNetCoreAppRefVersion>
4751
<MicrosoftAspNetCoreAppRefInternalVersion>$(MicrosoftAspNetCoreAppRefInternalPackageVersion)</MicrosoftAspNetCoreAppRefInternalVersion>
4852
<MicrosoftCodeAnalysisVersion>$(MicrosoftCodeAnalysisPackageVersion)</MicrosoftCodeAnalysisVersion>
4953
<MicrosoftCodeAnalysisAnalyzersVersion>$(MicrosoftCodeAnalysisAnalyzersPackageVersion)</MicrosoftCodeAnalysisAnalyzersVersion>
5054
<MicrosoftCodeAnalysisCSharpVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisCSharpVersion>
5155
<MicrosoftCodeAnalysisNetAnalyzersVersion>$(MicrosoftCodeAnalysisNetAnalyzersPackageVersion)</MicrosoftCodeAnalysisNetAnalyzersVersion>
52-
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
53-
<MicrosoftDotNetCodeAnalysisVersion>$(MicrosoftDotNetCodeAnalysisPackageVersion)</MicrosoftDotNetCodeAnalysisVersion>
5456
<MicrosoftNETSdkVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETSdkVersion>
5557
<MicrosoftNETCoreAppRefVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRefVersion>
5658
<MicrosoftNETCorePlatformsVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftNETCorePlatformsVersion>
@@ -60,7 +62,5 @@ This file should be imported by eng/Versions.props
6062
<runtimeosxx64MicrosoftDotNetCdacTransportVersion>$(runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion)</runtimeosxx64MicrosoftDotNetCdacTransportVersion>
6163
<runtimewinarm64MicrosoftDotNetCdacTransportVersion>$(runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion)</runtimewinarm64MicrosoftDotNetCdacTransportVersion>
6264
<runtimewinx64MicrosoftDotNetCdacTransportVersion>$(runtimewinx64MicrosoftDotNetCdacTransportPackageVersion)</runtimewinx64MicrosoftDotNetCdacTransportVersion>
63-
<!-- dotnet/arcade dependencies -->
64-
<MicrosoftDotNetRemoteExecutorVersion>$(MicrosoftDotNetRemoteExecutorPackageVersion)</MicrosoftDotNetRemoteExecutorVersion>
6565
</PropertyGroup>
6666
</Project>

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Dependencies>
22
<Source Uri="https://github.com/dotnet/dotnet" Mapping="diagnostics" Sha="4e6cfd9762f7562d398be31e2bff79f3e993a9c2" BarId="284895" />
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.0.0-beta.25610.1">
4+
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.0.0-beta.26072.1">
55
<Uri>https://github.com/microsoft/clrmd</Uri>
6-
<Sha>41c1e91786141d37b26cfdfb8059fc522e81fb8d</Sha>
6+
<Sha>6c44f5535222dbe59de9b7c5384d5303d56bdf5c</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.0-beta.25610.1">
8+
<Dependency Name="Microsoft.Diagnostics.Runtime.Utilities" Version="4.0.0-beta.26072.1">
99
<Uri>https://github.com/microsoft/clrmd</Uri>
10-
<Sha>41c1e91786141d37b26cfdfb8059fc522e81fb8d</Sha>
10+
<Sha>6c44f5535222dbe59de9b7c5384d5303d56bdf5c</Sha>
1111
</Dependency>
1212
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25210.1">
1313
<Uri>https://github.com/dotnet/command-line-api</Uri>
@@ -19,13 +19,13 @@
1919
</Dependency>
2020
</ProductDependencies>
2121
<ToolsetDependencies>
22-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25603.103">
23-
<Uri>https://github.com/dotnet/dotnet</Uri>
24-
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
22+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26066.3">
23+
<Uri>https://github.com/dotnet/arcade</Uri>
24+
<Sha>af17297350d5e5357d2ab3d69369d2a58b8bc4ab</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25603.103">
27-
<Uri>https://github.com/dotnet/dotnet</Uri>
28-
<Sha>5ddd0ddc0ebadca21645a05c419ed5a034454605</Sha>
26+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26066.3">
27+
<Uri>https://github.com/dotnet/arcade</Uri>
28+
<Sha>af17297350d5e5357d2ab3d69369d2a58b8bc4ab</Sha>
2929
</Dependency>
3030
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
3131
<Uri>https://github.com/dotnet/arcade</Uri>

‎eng/Versions.props‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
33
<PropertyGroup>
44
<RepositoryUrl>https://github.com/dotnet/diagnostics</RepositoryUrl>
5-
<PreReleaseVersionLabel></PreReleaseVersionLabel>
6-
<VersionPrefix>9.0.0</VersionPrefix>
5+
<PreReleaseVersionLabel/>
6+
7+
<!-- Lines intentionally left blank to prevent merge conflicts when upgrading version -->
8+
<VersionPrefix>10.0.0</VersionPrefix>
9+
710
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
811
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
912
<!--
@@ -51,7 +54,7 @@
5154
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
5255
<StyleCopAnalyzersVersion>1.2.0-beta.556</StyleCopAnalyzersVersion>
5356
<cdbsosversion>10.0.26100.1</cdbsosversion>
54-
<NewtonSoftJsonVersion>13.0.1</NewtonSoftJsonVersion>
57+
<NewtonSoftJsonVersion>13.0.3</NewtonSoftJsonVersion>
5558
<!-- Roslyn and analyzers -->
5659
<!-- dotnet/roslyn dependencies -->
5760
<!--
@@ -88,8 +91,8 @@
8891
8992
-->
9093
<PropertyGroup>
91-
<MicrosoftNETCoreApp90Version>9.0.10</MicrosoftNETCoreApp90Version>
92-
<MicrosoftNETCoreApp80Version>8.0.21</MicrosoftNETCoreApp80Version>
94+
<MicrosoftNETCoreApp90Version>9.0.12</MicrosoftNETCoreApp90Version>
95+
<MicrosoftNETCoreApp80Version>8.0.23</MicrosoftNETCoreApp80Version>
9396
</PropertyGroup>
9497
<PropertyGroup>
9598
<DotnetRuntimeVersion Condition="'$(DotnetRuntimeVersion)' == ''">default</DotnetRuntimeVersion>

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
# If it's not devdiv, it's dnceng
8181
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
8282
name: NetCore1ESPool-Publishing-Internal
83-
image: windows.vs2019.amd64
83+
image: windows.vs2022.amd64
8484
os: windows
8585
steps:
8686
- ${{ if eq(parameters.is1ESPipeline, '') }}:
@@ -120,6 +120,14 @@ jobs:
120120

121121
- task: NuGetAuthenticate@1
122122

123+
# Populate internal runtime variables.
124+
- template: /eng/common/templates/steps/enable-internal-sources.yml
125+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
126+
parameters:
127+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
128+
129+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
130+
123131
- task: AzureCLI@2
124132
displayName: Publish Build Assets
125133
inputs:
@@ -132,6 +140,9 @@ jobs:
132140
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
133141
/p:MaestroApiEndpoint=https://maestro.dot.net
134142
/p:OfficialBuildId=$(OfficialBuildId)
143+
-runtimeSourceFeed https://ci.dot.net/internal
144+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
145+
135146
condition: ${{ parameters.condition }}
136147
continueOnError: ${{ parameters.continueOnError }}
137148

@@ -200,6 +211,8 @@ jobs:
200211
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
201212
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
202213
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
214+
-runtimeSourceFeed https://ci.dot.net/internal
215+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
203216
204217
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
205218
- template: /eng/common/core-templates/steps/publish-logs.yml

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
demands: ImageOverride -equals build.ubuntu.2004.amd64
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
66-
image: 1es-mariner-2
66+
image: Azure-Linux-3-Amd64
6767
os: linux
6868
${{ else }}:
6969
pool:

‎eng/common/core-templates/job/source-index-stage1.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ parameters:
33
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
44
preSteps: []
55
binlogPath: artifacts/log/Debug/Build.binlog
6-
condition: ''
6+
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
77
dependsOn: ''
88
pool: ''
99
is1ESPipeline: ''
@@ -25,10 +25,10 @@ jobs:
2525
pool:
2626
${{ if eq(variables['System.TeamProject'], 'public') }}:
2727
name: $(DncEngPublicBuildPool)
28-
image: windows.vs2022.amd64.open
28+
image: windows.vs2026preview.scout.amd64.open
2929
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3030
name: $(DncEngInternalBuildPool)
31-
image: windows.vs2022.amd64
31+
image: windows.vs2026preview.scout.amd64
3232

3333
steps:
3434
- ${{ if eq(parameters.is1ESPipeline, '') }}:
@@ -41,4 +41,4 @@ jobs:
4141

4242
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
4343
parameters:
44-
binLogPath: ${{ parameters.binLogPath }}
44+
binLogPath: ${{ parameters.binLogPath }}

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ stages:
127127
${{ else }}:
128128
${{ if eq(parameters.is1ESPipeline, true) }}:
129129
name: $(DncEngInternalBuildPool)
130-
image: windows.vs2022.amd64
130+
image: windows.vs2026preview.scout.amd64
131131
os: windows
132132
${{ else }}:
133133
name: $(DncEngInternalBuildPool)
134-
demands: ImageOverride -equals windows.vs2022.amd64
134+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
135135

136136
steps:
137137
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -175,7 +175,7 @@ stages:
175175
os: windows
176176
${{ else }}:
177177
name: $(DncEngInternalBuildPool)
178-
demands: ImageOverride -equals windows.vs2022.amd64
178+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
179179
steps:
180180
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
181181
parameters:
@@ -236,7 +236,7 @@ stages:
236236
os: windows
237237
${{ else }}:
238238
name: $(DncEngInternalBuildPool)
239-
demands: ImageOverride -equals windows.vs2022.amd64
239+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
240240
steps:
241241
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
242242
parameters:
@@ -293,11 +293,11 @@ stages:
293293
${{ else }}:
294294
${{ if eq(parameters.is1ESPipeline, true) }}:
295295
name: NetCore1ESPool-Publishing-Internal
296-
image: windows.vs2019.amd64
296+
image: windows.vs2022.amd64
297297
os: windows
298298
${{ else }}:
299299
name: NetCore1ESPool-Publishing-Internal
300-
demands: ImageOverride -equals windows.vs2019.amd64
300+
demands: ImageOverride -equals windows.vs2022.amd64
301301
steps:
302302
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
303303
parameters:
@@ -307,6 +307,13 @@ stages:
307307

308308
- task: NuGetAuthenticate@1
309309

310+
# Populate internal runtime variables.
311+
- template: /eng/common/templates/steps/enable-internal-sources.yml
312+
parameters:
313+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
314+
315+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
316+
310317
# Darc is targeting 8.0, so make sure it's installed
311318
- task: UseDotNet@2
312319
inputs:
@@ -328,3 +335,5 @@ stages:
328335
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
329336
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
330337
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
338+
-runtimeSourceFeed https://ci.dot.net/internal
339+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'

0 commit comments

Comments
 (0)