Skip to content

Commit a29a642

Browse files
KathleenDollardKathleenDollard
committed
2 parents e7f3555 + e9ac4ff commit a29a642

File tree

88 files changed

+2344
-1630
lines changed

Some content is hidden

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

88 files changed

+2344
-1630
lines changed

‎.vsts-ci.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,12 @@ stages:
4848
variables:
4949
# Only enable publishing in official builds.
5050
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
51-
# DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
5251
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
53-
- group: DotNet-Blob-Feed
5452
- group: DotNet-Symbol-Server-Pats
5553
- group: Publish-Build-Assets
5654
- name: _OfficialBuildArgs
5755
value: /p:DotNetSignType=$(_SignType)
5856
/p:TeamName=$(_TeamName)
59-
/p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
60-
/p:DotNetPublishBlobFeedUrl=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
61-
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
6257
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
6358
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
6459
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
@@ -77,18 +72,15 @@ stages:
7772
Debug:
7873
_BuildConfig: Debug
7974
_SignType: test
80-
_DotNetPublishToBlobFeed: false
8175
_BuildArgs:
8276

8377
Release:
8478
_BuildConfig: Release
8579
# PRs or external builds are not signed.
8680
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
8781
_SignType: test
88-
_DotNetPublishToBlobFeed: false
8982
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
9083
_SignType: real
91-
_DotNetPublishToBlobFeed: true
9284
_BuildArgs: $(_OfficialBuildArgs)
9385
steps:
9486
- checkout: self
@@ -128,11 +120,9 @@ stages:
128120
Debug:
129121
_BuildConfig: Debug
130122
_SignType: none
131-
_DotNetPublishToBlobFeed : false
132123
Release:
133124
_BuildConfig: Release
134125
_SignType: none
135-
_DotNetPublishToBlobFeed : false
136126
steps:
137127
- checkout: self
138128
clean: true
@@ -172,6 +162,3 @@ stages:
172162

173163
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
174164
- template: eng\common\templates\post-build\post-build.yml
175-
parameters:
176-
publishingInfraVersion: 3
177-
enableSourceLinkValidation: false

‎CONTRIBUTING.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
11
Contributing
22
============
33

4-
Please read [.NET Core Guidelines](https://github.com/dotnet/runtime/blob/master/CONTRIBUTING.md) for more general information about coding styles, source structure, making pull requests, and more.
5-
While this project is in the early phases of development, some of the guidelines in this document -- such as API reviews -- do not yet apply as strongly.
6-
That said, please open a GitHub issue to discuss any API renames or changes before submitting PRs.
4+
Please read [.NET Guidelines](https://github.com/dotnet/runtime/blob/master/CONTRIBUTING.md) for more general information about coding styles, source structure, making pull requests, and more.
75

86
## Developer guide
97

108
This project can be developed on any platform. To get started, follow instructions for your OS.
119

1210
### Prerequisites
1311

14-
This project depends on .NET Core 2.0. Before working on the project, check that .NET Core prerequisites have been met.
15-
16-
- [Prerequisites for .NET Core on Windows](https://docs.microsoft.com/en-us/dotnet/core/windows-prerequisites?tabs=netcore2x)
17-
- [Prerequisites for .NET Core on Linux](https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore2x)
18-
- [Prerequisites for .NET Core on macOS](https://docs.microsoft.com/en-us/dotnet/core/macos-prerequisites?tabs=netcore2x)
12+
This project depends on .NET 7. Before working on the project, check that the [.NET SDK](https://dotnet.microsoft.com/en-us/download) is installed.
1913

2014
### Visual Studio
2115

22-
This project supports [Visual Studio 2017](https://visualstudio.com) and [Visual Studio for Mac](https://www.visualstudio.com/vs/visual-studio-mac/). Any version, including the free Community Edition, should be sufficient so long as you install Visual Studio support for .NET Core development.
16+
This project supports [Visual Studio 2022](https://visualstudio.com). Any version, including the free Community Edition, should be sufficient.
2317

2418
This project also supports using
25-
[Visual Studio Code](https://code.visualstudio.com). Install the [C# extension](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp) and install the [.NET Core CLI](https://get.dot.net/core) to get started.
19+
[Visual Studio Code](https://code.visualstudio.com). Install the [C# Dev Kit](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit).
2620

2721
### Command line scripts
2822

‎Directory.Build.props

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<Project>
3-
<Import Project="Sdk.props"
4-
Sdk="Microsoft.DotNet.Arcade.Sdk"
2+
3+
<Import Project="Sdk.props"
4+
Sdk="Microsoft.DotNet.Arcade.Sdk"
55
Condition="'$(DisableArcade)' != '1'" />
66

77
<PropertyGroup>
88
<NoWarn>$(NoWarn);NU5125;CS0618</NoWarn>
9-
<NoWarn Condition=" '$(DotnetBuildFromSource)' == 'true' ">$(NoWarn);CS8714;CS8765;CS8600;CS8601;CS8602;CS8603;CS8604</NoWarn>
109
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1110
<LangVersion>10.0</LangVersion>
1211
</PropertyGroup>
1312

14-
<PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
13+
<PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'">
1514
<TargetFrameworkForNETSDK>$(NetCurrent)</TargetFrameworkForNETSDK>
1615
</PropertyGroup>
1716

18-
<PropertyGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
17+
<PropertyGroup Condition="'$(DotNetBuildFromSource)' != 'true' and '$(DotNetBuildSourceOnly)' != 'true'">
1918
<TargetFrameworkForNETSDK>net7.0</TargetFrameworkForNETSDK>
2019
</PropertyGroup>
2120

22-
<PropertyGroup>
23-
<!-- This repo is currently on the .NET 5 APIs, but a build task in license validation during source build requires 6.0. -->
24-
<SuppressLicenseValidation>true</SuppressLicenseValidation>
25-
</PropertyGroup>
26-
2721
</Project>

‎Directory.Build.targets

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1-
<?xml version="1.0" encoding="utf-8"?>
21
<Project>
3-
<Import Project="Sdk.targets"
2+
3+
<Import Project="Sdk.targets"
44
Sdk="Microsoft.DotNet.Arcade.Sdk"
5-
Condition="'$(DisableArcade)' != '1'" />
6-
</Project>
5+
Condition="'$(DisableArcade)' != '1'" />
6+
7+
<PropertyGroup Condition="'$(DisableArcade)' == '1' and $(MSBuildProjectName.EndsWith('.Tests'))">
8+
<DefaultExcludesInProjectFolder>$(DefaultExcludesInProjectFolder);TestResults\**</DefaultExcludesInProjectFolder>
9+
</PropertyGroup>
10+
11+
<ItemGroup Condition="'$(DisableArcade)' == '1' and $(MSBuildProjectName.EndsWith('.Tests'))">
12+
<PackageReference Include="xunit" />
13+
<PackageReference Include="xunit.runner.visualstudio" />
14+
</ItemGroup>
15+
16+
</Project>

‎Directory.Packages.props

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
6+
<!-- Using multiple feeds isn't supported by Maestro: https://github.com/dotnet/arcade/issues/14155. -->
7+
<NoWarn>$(NoWarn);NU1507</NoWarn>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<!-- Roslyn dependencies -->
12+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.0.1" />
13+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
15+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.1" />
16+
<!-- Runtime dependencies -->
17+
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
18+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
19+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
20+
<!-- external dependencies -->
21+
<PackageVersion Include="ApprovalTests" Version="5.4.7" />
22+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
23+
<PackageVersion Include="FluentAssertions" Version="5.10.3" />
24+
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
25+
<PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
26+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
27+
<PackageVersion Include="System.Memory" Version="4.5.4" />
28+
<PackageVersion Include="system.reactive.core" Version="5.0.0" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition="'$(DisableArcade)' == '1'">
32+
<!-- The xunit version should be kept in sync with the one that Arcade promotes -->
33+
<PackageVersion Include="xunit" Version="2.4.1" />
34+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />
35+
</ItemGroup>
36+
37+
</Project>

‎NuGet.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1010
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
1111
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
12-
<!-- required by NativeAOT -->
13-
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
12+
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
1413
</packageSources>
1514
<disabledPackageSources />
1615
</configuration>

‎System.CommandLine.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
Directory.Build.props = Directory.Build.props
1414
Directory.Build.rsp = Directory.Build.rsp
1515
Directory.Build.targets = Directory.Build.targets
16+
Directory.Packages.props = Directory.Packages.props
1617
global.json = global.json
1718
LICENSE.md = LICENSE.md
1819
README.md = README.md

‎eng/Publishing.props

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
<UsageData>
55
<IgnorePatterns>
6-
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*" />
6+
<!-- Picks this up from the SDK. This is allowed for the repo build and won't be an issue with full VMR
7+
build because it will be retrieved from the N-1 artifacts. -->
8+
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/8.*" />
79
</IgnorePatterns>
810
</UsageData>

‎eng/Version.Details.xml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23371.1">
4+
<!-- Intermediate is necessary for source build. -->
5+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24061.1">
56
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
6-
<Sha>c418ea641dfded915409e09387985fba7bccc781</Sha>
7+
<Sha>453a37ef7ae6c335cd49b3b9ab7713c87faeb265</Sha>
78
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
89
</Dependency>
910
</ProductDependencies>
1011
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23052.2">
12+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24059.1">
1213
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>5a5ae41c42e475e280342b668e668ff34539e36d</Sha>
14+
<Sha>8000dd1a9ad9017e0cd1e9fd079c42b6dd7e6962</Sha>
15+
</Dependency>
16+
<!-- Intermediate is necessary for source build. -->
17+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24059.1">
18+
<Uri>https://github.com/dotnet/arcade</Uri>
19+
<Sha>8000dd1a9ad9017e0cd1e9fd079c42b6dd7e6962</Sha>
1420
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1521
</Dependency>
16-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22518-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
17-
<Uri>https://github.com/dotnet/sourcelink</Uri>
18-
<Sha>d047202874ad79d72c75b6354c0f8a9a12d1b054</Sha>
19-
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
22+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
23+
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
24+
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
2025
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22631.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
26+
<!-- Intermediate is necessary for source build. -->
27+
<Dependency Name="Microsoft.SourceBuild.Intermediate.xliff-tasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
2228
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
23-
<Sha>ca611a68bb48cedf72a782d41622453cb2dab100</Sha>
29+
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
2430
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
2531
</Dependency>
2632
</ToolsetDependencies>

‎eng/Versions.props

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
3-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4-
<PropertyGroup>
5-
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
6-
</PropertyGroup>
1+
<Project>
72
<!-- Repo Version Information -->
83
<PropertyGroup>
94
<!-- Default version number to global tool. -->
105
<VersionPrefix>0.1.0</VersionPrefix>
116
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
127
<PreReleaseVersionLabel>
138
</PreReleaseVersionLabel>
9+
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
10+
<PublishWindowsPdb>true</PublishWindowsPdb>
1411
</PropertyGroup>
1512
<PropertyGroup Condition="'$(UseGlobalToolVersion)' == 'true'">
1613
<AutoGenerateAssemblyVersion>false</AutoGenerateAssemblyVersion>
@@ -25,15 +22,4 @@
2522
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
2623
<AutoGenerateAssemblyVersion>false</AutoGenerateAssemblyVersion>
2724
</PropertyGroup>
28-
<PropertyGroup>
29-
<UsingToolSourceLink>true</UsingToolSourceLink>
30-
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
31-
<PublishWindowsPdb>true</PublishWindowsPdb>
32-
</PropertyGroup>
33-
<!-- Package versions -->
34-
<PropertyGroup>
35-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>8.0.0-alpha.1.23371.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
36-
<MicrosoftSourceLinkGitHubVersion>1.2.0-beta-22518-02</MicrosoftSourceLinkGitHubVersion>
37-
<MicrosoftDotNetXliffTasksVersion>1.0.0-beta.22631.1</MicrosoftDotNetXliffTasksVersion>
38-
</PropertyGroup>
3925
</Project>

‎eng/common/SetupNugetSources.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ if ($dotnet31Source -ne $null) {
153153
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
154154
}
155155

156-
$dotnetVersions = @('5','6','7')
156+
$dotnetVersions = @('5','6','7','8')
157157

158158
foreach ($dotnetVersion in $dotnetVersions) {
159159
$feedPrefix = "dotnet" + $dotnetVersion;

‎eng/common/SetupNugetSources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ if [ "$?" == "0" ]; then
105105
PackageSources+=('dotnet3.1-internal-transport')
106106
fi
107107

108-
DotNetVersions=('5' '6' '7')
108+
DotNetVersions=('5' '6' '7' '8')
109109

110110
for DotNetVersion in ${DotNetVersions[@]} ; do
111111
FeedPrefix="dotnet${DotNetVersion}";

‎eng/common/cross/arm/sources.list.xenial

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
88
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
99

1010
deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11-
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse

‎eng/common/cross/arm64/sources.list.xenial

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
88
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
99

1010
deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11-
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse

0 commit comments

Comments
 (0)