Skip to content

Commit 81fd7ea

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'main' into merge/release/7.0.2xx-to-main
2 parents 9b4ca48 + 8f9568f commit 81fd7ea

File tree

164 files changed

+3783
-1268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+3783
-1268
lines changed

‎.github/fabricbot.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,39 @@
137137
}
138138
]
139139
}
140+
},
141+
{
142+
"taskType": "trigger",
143+
"capabilityId": "IssueResponder",
144+
"subCapability": "IssuesOnlyResponder",
145+
"version": "1.0",
146+
"config": {
147+
"conditions": {
148+
"operator": "and",
149+
"operands": [
150+
{
151+
"name": "labelAdded",
152+
"parameters": {
153+
"label": "Area-ILLink"
154+
}
155+
}
156+
]
157+
},
158+
"eventType": "issue",
159+
"eventNames": [
160+
"issues",
161+
"project_card"
162+
],
163+
"taskName": "Notify linker of new untriaged bugs",
164+
"actions": [
165+
{
166+
"name": "addReply",
167+
"parameters": {
168+
"comment": "@dotnet/linker-contrib a new issue has been filed in the ILLink area, please triage"
169+
}
170+
}
171+
]
172+
}
140173
}
141174
],
142175
"userGroups": []

‎.vsts-ci-richnav.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@ pr: none
1010
variables:
1111
- name: teamName
1212
value: Roslyn-Project-System
13-
- name: _DotNetPublishToBlobFeed
14-
value: false
15-
- name: _DotNetArtifactsCategory
16-
value: .NETCore
17-
- name: _DotNetValidationArtifactsCategory
18-
value: .NETCore
19-
- name: _PublishToAzure
20-
value: false
2113
- name: PostBuildSign
2214
value: true
2315

@@ -32,8 +24,8 @@ stages:
3224
richCodeNavigationLanguage: 'csharp'
3325
richCodeNavigationEnvironment: 'production'
3426
pool:
35-
name: NetCore-Svc-Public
36-
demands: ImageOverride -equals windows.vs2019.amd64.open
27+
name: NetCore-Public
28+
demands: ImageOverride -equals windows.vs2019.amd64.open
3729
timeoutInMinutes: 180
3830
strategy:
3931
matrix:

‎.vsts-ci.yml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ trigger:
22
batch: true
33
branches:
44
include:
5-
- master
65
- main
76
- release/*
87
- internal/release/3.*
@@ -35,11 +34,13 @@ variables:
3534
value: ''
3635
- name: _OfficialBuildArgs
3736
value: ''
37+
- name: "skipComponentGovernanceDetection"
38+
value: "true"
3839
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
39-
- name: _DotNetPublishToBlobFeed
40-
value: true
4140
- name: _OfficialBuildArgs
4241
value: /p:OfficialBuilder=Microsoft
42+
- name: Codeql.Enabled
43+
value: true
4344
- group: DotNetBuilds storage account read tokens
4445
- name: _InternalRuntimeDownloadArgs
4546
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
@@ -56,7 +57,7 @@ stages:
5657
${{ if eq(variables['System.TeamProject'], 'public') }}:
5758
vmImage: 'windows-2019'
5859
${{ if eq(variables['System.TeamProject'], 'internal') }}:
59-
name: NetCore1ESPool-Svc-Internal
60+
name: NetCore1ESPool-Internal
6061
demands: ImageOverride -equals windows.vs2019.amd64
6162
steps:
6263
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
@@ -69,7 +70,7 @@ stages:
6970
${{ if eq(variables['System.TeamProject'], 'public') }}:
7071
vmImage: 'windows-2022'
7172
${{ if ne(variables['System.TeamProject'], 'public') }}:
72-
name: NetCore1ESPool-Svc-Internal
73+
name: NetCore1ESPool-Internal
7374
demands: ImageOverride -equals windows.vs2022preview.amd64
7475
${{ if eq(variables['System.TeamProject'], 'public') }}:
7576
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
@@ -99,7 +100,7 @@ stages:
99100
${{ if eq(variables['System.TeamProject'], 'public') }}:
100101
vmImage: 'windows-2022'
101102
${{ if ne(variables['System.TeamProject'], 'public') }}:
102-
name: NetCore1ESPool-Svc-Internal
103+
name: NetCore1ESPool-Internal
103104
demands: ImageOverride -equals windows.vs2022preview.amd64
104105
${{ if eq(variables['System.TeamProject'], 'public') }}:
105106
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
@@ -125,7 +126,7 @@ stages:
125126
${{ if eq(variables['System.TeamProject'], 'public') }}:
126127
vmImage: 'windows-2019'
127128
${{ if ne(variables['System.TeamProject'], 'public') }}:
128-
name: NetCore1ESPool-Svc-Internal
129+
name: NetCore1ESPool-Internal
129130
demands: ImageOverride -equals windows.vs2019.amd64
130131
strategy:
131132
matrix:
@@ -141,7 +142,7 @@ stages:
141142
${{ if eq(variables['System.TeamProject'], 'public') }}:
142143
vmImage: 'ubuntu-22.04'
143144
${{ if ne(variables['System.TeamProject'], 'public') }}:
144-
name: NetCore1ESPool-Svc-Internal
145+
name: NetCore1ESPool-Internal
145146
demands: ImageOverride -equals 1es-ubuntu-2204
146147
${{ if eq(variables['System.TeamProject'], 'public') }}:
147148
helixTargetQueue: 'ubuntu.2204.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64-20220813234317-1b9461f'
@@ -178,11 +179,12 @@ stages:
178179
- template: /eng/common/templates/job/publish-build-assets.yml
179180
parameters:
180181
publishUsingPipelines: true
182+
publishAssetsImmediately: true
181183
dependsOn:
182184
- Windows_NT
183185
- Source_Build_Managed
184186
pool:
185-
name: NetCore1ESPool-Svc-Internal
187+
name: NetCore1ESPool-Internal
186188
demands: ImageOverride -equals windows.vs2019.amd64
187189
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
188190
- template: /eng/common/templates/post-build/post-build.yml
@@ -193,6 +195,7 @@ stages:
193195
enableNugetValidation: false
194196
enableSourceLinkValidation: false
195197
publishInstallersAndChecksums: true
198+
publishAssetsImmediately: true
196199
SDLValidationParameters:
197200
enable: false
198201
params: ' -SourceToolsList @("policheck","credscan")

‎CODEOWNERS‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
/src/Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests/ @vijayrkn
1313

1414
# Area-AspNetCore
15-
/src/BlazorWasmSdk/ @captainsafia @mkArtakMSFT @TanayParikh @javiercn
16-
/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ @captainsafia @mkArtakMSFT
17-
/src/Assets/TestProjects/BlazorHosted/ @captainsafia @mkArtakMSFT
18-
/src/Assets/TestProjects/BlazorHostedRID/ @captainsafia @mkArtakMSFT
19-
/src/Assets/TestProjects/BlazorWasmMinimal/ @captainsafia @mkArtakMSFT
20-
/src/Assets/TestProjects/BlazorWasmWithLibrary/ @captainsafia @mkArtakMSFT
21-
/src/RazorSdk/ @captainsafia @mkArtakMSFT
22-
/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/ @mkArtakMSFT @TanayParikh @javiercn
23-
/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ @captainsafia @mkArtakMSFT
24-
/src/Tests/Microsoft.NET.Sdk.Razor.Tool.Tests/ @captainsafia @mkArtakMSFT
25-
/src/Assets/TestPackages/PackageLibraryDirectDependency/ @captainsafia @mkArtakMSFT
26-
/src/Assets/TestPackages/PackageLibraryTransitiveDependency/ @captainsafia @mkArtakMSFT
27-
/src/src/Assets/TestProjects/Razor*/ @captainsafia @mkArtakMSFT
15+
/src/BlazorWasmSdk/ @dotnet/aspnet-blazor-eng
16+
/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ @dotnet/aspnet-blazor-eng
17+
/src/Assets/TestProjects/BlazorHosted/ @dotnet/aspnet-blazor-eng
18+
/src/Assets/TestProjects/BlazorHostedRID/ @dotnet/aspnet-blazor-eng
19+
/src/Assets/TestProjects/BlazorWasmMinimal/ @dotnet/aspnet-blazor-eng
20+
/src/Assets/TestProjects/BlazorWasmWithLibrary/ @dotnet/aspnet-blazor-eng
21+
/src/RazorSdk/ @dotnet/aspnet-blazor-eng
22+
/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/ @dotnet/aspnet-blazor-eng
23+
/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ @dotnet/aspnet-blazor-eng
24+
/src/Tests/Microsoft.NET.Sdk.Razor.Tool.Tests/ @dotnet/aspnet-blazor-eng
25+
/src/Assets/TestPackages/PackageLibraryDirectDependency/ @dotnet/aspnet-blazor-eng
26+
/src/Assets/TestPackages/PackageLibraryTransitiveDependency/ @dotnet/aspnet-blazor-eng
27+
/src/src/Assets/TestProjects/Razor*/ @dotnet/aspnet-blazor-eng
2828

2929
# Area-Format
3030
/src/Cli/dotnet/commands/dotnet-format @jmarolf @JoeRobich
@@ -66,10 +66,11 @@
6666
/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
6767

6868
# Area-Watch
69-
/src/Assets/TestProjects/Watch*/ @captainsafia @mkArtakMSFT
70-
/src/Tests/dotnet-watch.Tests/ @captainsafia @mkArtakMSFT
71-
/src/Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @captainsafia @mkArtakMSFT
72-
/src/BuiltInTools/ @captainsafia @mkArtakMSFT
69+
/src/Assets/TestProjects/Watch*/ @tmat @arkalyanms
70+
/src/Tests/dotnet-watch.Tests/ @tmat @arkalyanms
71+
/src/Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @dotnet/aspnet-blazor-eng
72+
/src/BuiltInTools/* @tmat @arkalyanms
73+
/src/BuiltInTools/BrowserRefresh @dotnet/aspnet-blazor-eng
7374

7475
# ApiCompat tools owned by runtime team
7576
# Area-ApiCompat

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
2121
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
2222
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
23+
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
24+
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
2325
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
2426
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
2527
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />

‎documentation/specs/runtime-configuration-file.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ This section contains a union of all the dependencies found in the various targe
183183
* `path` - in the `package` library this is a relative path where to find the assets.
184184
* `serviceable` - a boolean indicating if the library can be serviced (only for `package`-typed libraries)
185185
* `sha512` - SHA-512 hash of the package file (`package`-typed libraries).
186-
* `hashPath` - in the `package` library this is a relative path to the `.nupkg.sha512` has file.
186+
* `hashPath` - in the `package` library this is a relative path to the `.nupkg.sha512` hash file.
187187

188188
### `runtimes` Section (`.deps.json`)
189189

@@ -349,7 +349,7 @@ The path to a runtime-specific asset is resolved in the same way as a normal ass
349349

350350
Each entry in the `runtime` or `runtimeTargets` sections can also have `assemblyVersion` and `fileVersion` properties. These specify the assembly and file version of the assembly being referenced. These versions are used when resolving assemblies based on roll-forward settings. See the [Multi Level Shared FX Lookup](https://github.com/dotnet/core-setup/blob/main/Documentation/design-docs/multilevel-sharedfx-lookup.md#hostpolicy-changes-for-21) for more details.
351351

352-
## Additional information on runtimeconfig.json frammework settings (3.0+)
352+
## Additional information on runtimeconfig.json framework settings (3.0+)
353353
With the addition of the `frameworks` section in 3.0, an application (or another framework) can reference multiple frameworks. This is necessary when more than one framework is being used by the application (or framework). Previously, an application or framework could only reference one framework, causing a "chain" of frameworks. Now, with multiple frameworks at each level, a "graph" or "tree" of frameworks is supported.
354354

355355
In addition to specifying a dependency on more than one framework, the `frameworks` section can also be used to override settings from a framework's `runtimeconfig.json`; this should only be done with the understanding of all consequences including preventing roll-forward compatibility to future versions. The settings include `version`, `rollForwardOnNoCandidateFx` and `applyPatches`, with `version` the most likely value to be changed.

0 commit comments

Comments
 (0)