Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/dotnet/sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
SignOnNL committed Jun 27, 2022
2 parents 5ecb697 + 0cd38c9 commit 29da92d
Show file tree
Hide file tree
Showing 1,104 changed files with 36,848 additions and 12,677 deletions.
106 changes: 106 additions & 0 deletions .github/fabricbot.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
[
{
"taskType": "trigger",
"capabilityId": "AutoMerge",
"subCapability": "AutoMerge",
"version": "1.0",
"config": {
"taskName": "Automatically merge pull requests",
"deleteBranches": true,
"removeLabelOnPush": true,
"mergeType": "squash",
"minMinutesOpen": "12",
"label": "Auto-Merge If Tests Pass",
"requireAllStatuses": true
}
},
{
"taskType": "scheduled",
"capabilityId": "ScheduledSearch",
"subCapability": "ScheduledSearch",
"version": "1.1",
"config": {
"frequency": [
{
"weekDay": 0,
"hours": [
16
],
"timezoneOffset": -7
},
{
"weekDay": 1,
"hours": [
16
],
"timezoneOffset": -7
},
{
"weekDay": 2,
"hours": [
16
],
"timezoneOffset": -7
},
{
"weekDay": 3,
"hours": [
16
],
"timezoneOffset": -7
},
{
"weekDay": 4,
"hours": [
16
],
"timezoneOffset": -7
},
{
"weekDay": 5,
"hours": [
16
],
"timezoneOffset": -7
},
{
"weekDay": 6,
"hours": [
16
],
"timezoneOffset": -7
}
],
"searchTerms": [
{
"name": "isIssue",
"parameters": {}
},
{
"name": "isOpen",
"parameters": {}
},
{
"name": "hasLabel",
"parameters": {
"label": "Area-NuGet"
}
}
],
"taskName": "Auto close \"Area-NuGet\" issues and add a comment pointing to NuGet repo",
"actions": [
{
"name": "addReply",
"parameters": {
"comment": "Thanks for creating this issue! We believe this issue is related to NuGet tooling, which is maintained by the NuGet team. Thus, we closed this one and encourage you to raise this issue in the [NuGet repository](https://github.com/NuGet/Home) instead. Don’t forget to check out [NuGet’s contributing guide](https://github.com/NuGet/Home/blob/dev/CONTRIBUTING.md#before-submitting-an-issue) before submitting an issue!\n\nIf you believe this issue was closed out of error, please comment to let us know.\n\nHappy Coding!"
}
},
{
"name": "closeIssue",
"parameters": {}
}
]
},
"disabled": false
}
]
52 changes: 35 additions & 17 deletions .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ trigger:
- internal/release/3.*
- internal/release/5.*
- internal/release/6.*
paths:
exclude:
- "*.md"

variables:
- name: teamName
Expand All @@ -20,13 +23,16 @@ variables:
value: .NETCore
- name: PostBuildSign
value: true
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: _InternalRuntimeDownloadArgs
value: ''
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- name: _DotNetPublishToBlobFeed
value: true
- group: DotNet-MSRC-Storage
- group: DotNetBuilds storage account read tokens
- name: _InternalRuntimeDownloadArgs
value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
/p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- group: DotNet-CLI-SDLValidation-Params

Expand All @@ -35,6 +41,13 @@ stages:
displayName: Build
jobs:
- job: Publish_Build_Configuration
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Public
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals build.windows.10.amd64.vs2019
steps:
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
artifact: BuildConfiguration
Expand All @@ -45,11 +58,14 @@ stages:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre
helixTargetQueue: Windows.Server.Amd64.VS2019.Pre.Open
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.Amd64.VS2022.Pre
strategy:
matrix:
Build_Release:
Expand All @@ -73,14 +89,14 @@ stages:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.Server.Amd64.VS2019.Pre.Open
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
${{ if ne(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Windows.Server.Amd64.VS2019.Pre.Open
helixTargetQueue: Windows.Amd64.VS2022.Pre
strategy:
matrix:
Build_Debug:
Expand Down Expand Up @@ -113,18 +129,18 @@ stages:

- template: /eng/build.yml
parameters:
agentOs: Ubuntu_18_04
agentOs: Ubuntu_20_04
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
demands: ImageOverride -equals 1es-ubuntu-2004-open
${{ if ne(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
demands: ImageOverride -equals 1es-ubuntu-2004
${{ if eq(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Ubuntu.1804.Amd64.Open
helixTargetQueue: 'ubuntu.2004.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-amd64-20220502145738-4b2e4c2'
${{ if ne(variables['System.TeamProject'], 'public') }}:
helixTargetQueue: Ubuntu.1804.Amd64
helixTargetQueue: Ubuntu.2004.Amd64
strategy:
matrix:
Build_Release:
Expand Down Expand Up @@ -156,8 +172,10 @@ stages:
publishUsingPipelines: true
dependsOn:
- Windows_NT
queue:
name: Hosted VS2017
- Source_Build_Managed
pool:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/common/templates/post-build/post-build.yml
parameters:
Expand Down
44 changes: 22 additions & 22 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@
/src/Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests/ @vijayrkn

# Area-AspNetCore
/src/BlazorWasmSdk/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/Assets/TestProjects/BlazorHosted/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/Assets/TestProjects/BlazorHostedRID/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/Assets/TestProjects/BlazorWasmMinimal/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/Assets/TestProjects/BlazorWasmWithLibrary/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/RazorSdk/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/ @pranavkm, @mkArtakMSFT, @TanayParikh, @javiercn
/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/Tests/Microsoft.NET.Sdk.Razor.Tool.Tests/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/Assets/TestPackages/PackageLibraryDirectDependency/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/Assets/TestPackages/PackageLibraryTransitiveDependency/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/src/Assets/TestProjects/Razor*/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/BlazorWasmSdk/ @captainsafia @mkArtakMSFT @TanayParikh @javiercn
/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ @captainsafia @mkArtakMSFT
/src/Assets/TestProjects/BlazorHosted/ @captainsafia @mkArtakMSFT
/src/Assets/TestProjects/BlazorHostedRID/ @captainsafia @mkArtakMSFT
/src/Assets/TestProjects/BlazorWasmMinimal/ @captainsafia @mkArtakMSFT
/src/Assets/TestProjects/BlazorWasmWithLibrary/ @captainsafia @mkArtakMSFT
/src/RazorSdk/ @captainsafia @mkArtakMSFT
/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/ @mkArtakMSFT @TanayParikh @javiercn
/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ @captainsafia @mkArtakMSFT
/src/Tests/Microsoft.NET.Sdk.Razor.Tool.Tests/ @captainsafia @mkArtakMSFT
/src/Assets/TestPackages/PackageLibraryDirectDependency/ @captainsafia @mkArtakMSFT
/src/Assets/TestPackages/PackageLibraryTransitiveDependency/ @captainsafia @mkArtakMSFT
/src/src/Assets/TestProjects/Razor*/ @captainsafia @mkArtakMSFT

# Area-Format
/src/Cli/dotnet/commands/dotnet-format @jmarolf, @JoeRobich
/src/Tests/dotnet-format.Tests @jmarolf, @JoeRobich
/src/Cli/dotnet/commands/dotnet-format @jmarolf @JoeRobich
/src/Tests/dotnet-format.Tests @jmarolf @JoeRobich

# Area-NuGet
/src/Cli/dotnet/commands/dotnet-add/dotnet-add-package @dotnet/nuget-team
Expand Down Expand Up @@ -62,13 +62,13 @@
/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak

# Area-Watch
/src/Assets/TestProjects/Watch*/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/Tests/dotnet-watch.Tests/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/BuiltInTools/ @captainsafia, @pranavkm, @mkArtakMSFT
/src/Assets/TestProjects/Watch*/ @captainsafia @mkArtakMSFT
/src/Tests/dotnet-watch.Tests/ @captainsafia @mkArtakMSFT
/src/Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @captainsafia @mkArtakMSFT
/src/BuiltInTools/ @captainsafia @mkArtakMSFT

# Compatibility tools owned by runtime team
# Area-Compatibility
/src/Compatibility/ @Anipik, @safern, @ericstj
/src/Tests/Microsoft.DotNet.ApiCompatibility.Tests/ @Anipik, @safern, @ericstj
/src/Tests/Microsoft.DotNet.PackageValidation.Tests/ @Anipik, @safern, @ericstj
/src/Compatibility/ @ericstj @dotnet/area-infrastructure-libraries @joperezr
/src/Tests/Microsoft.DotNet.ApiCompatibility.Tests/ @ericstj @dotnet/area-infrastructure-libraries @joperezr
/src/Tests/Microsoft.DotNet.PackageValidation.Tests/ @ericstj @dotnet/area-infrastructure-libraries @joperezr
15 changes: 12 additions & 3 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,17 @@
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
<!-- Used for Rich Navigation indexing task -->
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
<!-- Remove after RTM. Working around lack of automated creation of isolated feeds for nuget client -->
<add key="darc-pub-nuget-nuget.client-078701b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-nuget-nuget.client-078701b/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-templating -->
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
</configuration>
7 changes: 6 additions & 1 deletion build/RunTestsOnHelix.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,9 @@ FOR /F "tokens=*" %%g IN ('PowerShell -ExecutionPolicy ByPass [System.IO.Path]::
set TestExecutionDirectory=%TEMP%\dotnetSdkTests\%RandomDirectoryName%
set DOTNET_CLI_HOME=%TestExecutionDirectory%\.dotnet
mkdir %TestExecutionDirectory%
robocopy %HELIX_CORRELATION_PAYLOAD%\t\TestExecutionDirectoryFiles %TestExecutionDirectory%
robocopy %HELIX_CORRELATION_PAYLOAD%\t\TestExecutionDirectoryFiles %TestExecutionDirectory% /s

REM call dotnet new so the first run message doesn't interfere with the first test
dotnet new --debug:ephemeral-hive
REM avoid potetial cocurrency issues when nuget is creating nuget.config
dotnet nuget list source
5 changes: 5 additions & 0 deletions build/RunTestsOnHelix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@ export TestExecutionDirectory=$(pwd)/testExecutionDirectory
mkdir $TestExecutionDirectory
export DOTNET_CLI_HOME=$TestExecutionDirectory/.dotnet
cp -a $HELIX_CORRELATION_PAYLOAD/t/TestExecutionDirectoryFiles/. $TestExecutionDirectory/

# call dotnet new so the first run message doesn't interfere with the first test
dotnet new --debug:ephemeral-hive
# avoid potetial concurrency issues when nuget is creating nuget.config
dotnet nuget list source
2 changes: 2 additions & 0 deletions documentation/general/UpdateToNewTargetFramework.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
- More test fixes -- https://github.com/dotnet/installer/pull/11750/commits/9a7b55da4d5c777268295326f6be8469f8b4b9f9
- Stage 0 Update -- https://github.com/dotnet/installer/pull/11750/commits/02286315b221895b8181fc350b44bcdf399f7d92
- Install RC version of runtime -- https://github.com/dotnet/installer/commit/ea68501d392ab28b32af5d62946a764e2fadf88c
- Update Templates -- https://github.com/dotnet/installer/pull/12946
- Update DefaultKnownFrameworkReference to be the .0 versions -- https://github.com/dotnet/installer/pull/12654/commits/0e9ba442710970aabef42bbd3a2da69e30f031d4
1 change: 1 addition & 0 deletions documentation/general/aspnetcore-tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The .NET Core CLI includes some commands that are specific to ASP.NET Core proje

- dotnet dev-certs
- dotnet user-secrets
- dotnet user-jwts
- dotnet sql-cache

For more information on these tools, see <https://github.com/aspnet/DotNetTools>.
21 changes: 21 additions & 0 deletions documentation/general/workloads/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# .NET SDK Workloads

.NET SDK Workloads are optional components of the .NET SDK.

Some of the design docs for workloads are in the [dotnet/designs](https://github.com/dotnet/designs) repo:

- [.NET Optional SDK Workloads](https://github.com/dotnet/designs/blob/main/accepted/2020/workloads/workloads.md)
- [MSBuild SDK Resolvers and optional workloads](https://github.com/dotnet/designs/blob/main/accepted/2020/workloads/workload-resolvers.md)
- [.NET SDK Workload Manifests](https://github.com/dotnet/designs/blob/main/accepted/2020/workloads/workload-manifest.md)
- [Workload installation](https://github.com/dotnet/designs/pull/188)

Other documentation for workloads is in this repo:

- [.NET SDK Workload Rollback](workload-rollback.md)
- [User local workloads](user-local-workloads.md)
- [Workload manifest fallback](workload-fallback.md)
- [Preview feature bands](workload-preview-bands.md)
- [.NET SDK Installer Finalizer](workload-finalizer.md)
- [Workload description localization](https://github.com/dotnet/sdk/pull/21189)
- [Grouping multiple packs into one MSI](https://github.com/dotnet/sdk/issues/21741)
- [Handling workload assets across major .NET versions](cross-version-workloads.md)
Loading

0 comments on commit 29da92d

Please sign in to comment.