8000 Merge branch 'main' into edvilme-toolx · dotnet/sdk@fcd119a · GitHub
[go: up one dir, main page]
Skip to content

Commit fcd119a

Browse files
edvilmeedvilme
authored
Merge branch 'main' into edvilme-toolx
2 parents 8936d4e + f98b22c commit fcd119a

File tree

113 files changed

+8534
-760
lines changed

Some content is hidden

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

113 files changed

+8534
-760
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25225.3",
6+
"version": "1.1.0-beta.25229.5",
77
"commands": [
88
"darc"
99
]

‎CODEOWNERS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,15 @@
8484

8585
# Compatibility tools owned by runtime team
8686
/src/Compatibility/ @dotnet/area-infrastructure-libraries
87+
88+
# Area-ApiCompat
8789
/test/Microsoft.DotNet.ApiCompatibility*/ @dotnet/area-infrastructure-libraries
8890
/test/Microsoft.DotNet.ApiCompat*/ @dotnet/area-infrastructure-libraries
8991
/test/Microsoft.DotNet.PackageValidation*/ @dotnet/area-infrastructure-libraries
9092

93+
# Area-ApiDiff
94+
/test/Microsoft.DotNet.ApiDiff.Tests/ @dotnet/area-infrastructure-libraries
95+
9196
# Area-GenAPI
9297
/src/Compatibility/GenAPI/ @dotnet/area-infrastructure-libraries
9398
/src/Compatibility/Microsoft.DotNet.ApiSymbolExtensions/ @dotnet/area-infrastructure-libraries
@@ -106,4 +111,3 @@
106111

107112
# Area: VMR & SourceBuild
108113
/eng/DotNetBuild.props @dotnet/source-build @dotnet/product-construction
109-
/eng/SourceBuild* @dotnet/source-build

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<SdkSrcRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src'))</SdkSrcRoot>
3232
<PackageProjectUrl>https://github.com/dotnet/sdk</PackageProjectUrl>
3333
<PackageLicenseExpression>MIT</PackageLicenseExpression>
34-
<LangVersion>Latest</LangVersion>
34+
<LangVersion>Preview</LangVersion>
3535
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
3636
<DebugSymbols>true</DebugSymbols>
3737
<!-- Default to all packages generating a corresponding symbol package -->

‎Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
<PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" />
102102
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
103103
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
104+
<PackageVersion Include="System.CommandLine.NamingConventionBinder" Version="$(SystemCommandLineNamingConventionBinderVersion)" />
104105
<PackageVersion Include="System.Composition.AttributedModel" Version="$(SystemCompositionAttributedModelPackageVersion)" />
105106
<PackageVersion Include="System.Composition.Convention" Version="$(SystemCompositionConventionPackageVersion)" />
106107
<PackageVersion Include="System.Composition.Hosting" Version="$(SystemCompositionHostingPackageVersion)" />

‎documentation/general/dotnet-run-file.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,11 @@ but that would require changes to the native dotnet host.
257257

258258
## Other commands
259259

260-
We can consider supporting other commands like `dotnet build`, `dotnet pack`, `dotnet watch`.
260+
Commands `dotnet restore file.cs` and `dotnet build file.cs` are needed for IDE support and hence work for file-based programs.
261+
We can consider supporting other commands like `dotnet pack`, `dotnet watch`,
262+
however the primary scenario is `dotnet run` and we might never support additional commands.
261263

262-
These commands need to have a way to receive the target path similarly to `dotnet run`,
264+
All commands supporting file-based programs should have a way to receive the target path similarly to `dotnet run`,
263265
e.g., via options like `--directory`/`--entry` as described [above](#integration-into-the-existing-dotnet-run-command),
264266
or as the first argument if it makes sense for them.
265267

‎eng/Signing.props

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<FileSignInfo Include="PackageWithFakeNativeDep.dll" CertificateName="None" />
2323
<FileSignInfo Include="dotnet-tool-with-output-name.dll" CertificateName="None" />
2424

25-
<!-- Third party DLLs used by tests -->
25+
<!-- Third party DLLs used by tests-->
2626
<FileSignInfo Include="Castle.Core.dll" CertificateName="None" />
2727
<FileSignInfo Include="Moq.dll" CertificateName="None" />
2828

@@ -71,6 +71,17 @@
7171
<FileSignInfo Include="@(MacOSPkg->'%(Filename)%(Extension)')" CertificateName="MacDeveloperWithNotarization" />
7272
</ItemGroup>
7373

74+
<!-- Third party DLLs used in src projects that are not participating in source-build -->
75+
<ItemGroup>
76+
<FileSignInfo Include="Argon.dll" CertificateName="$(ExternalCertificateId)" />
77+
<FileSignInfo Include="DiffEngine.dll" CertificateName="$(ExternalCertificateId)" />
78+
<FileSignInfo Include="DiffPlex.dll" CertificateName="$(ExternalCertificateId)" />
79+
<FileSignInfo Include="EmptyFiles.dll" CertificateName="$(ExternalCertificateId)" />
80+
<FileSignInfo Include="SimpleInfoName.dll" CertificateName="$(ExternalCertificateId)" />
81+
<FileSignInfo Include="Verify.dll" CertificateName="$(ExternalCertificateId)" />
82+
<FileSignInfo Include="Verify.DiffPlex.dll" CertificateName="$(ExternalCertificateId)" />
83+
</ItemGroup>
84+
7485
<ItemGroup>
7586
<FileSignInfo Include="StreamJsonRpc.dll" CertificateName="MicrosoftSHA2" />
7687
</ItemGroup>

0 commit comments

Comments
 (0)
0