Skip to content

Commit

Permalink
Merge branch 'main' into EnableConfigBinderSG
Browse files Browse the repository at this point in the history
  • Loading branch information
eerhardt authored Nov 9, 2023
2 parents 8eecb8b + 33abf0c commit 23b1714
Show file tree
Hide file tree
Showing 115 changed files with 1,323 additions and 3,531 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.visualstudio.slngen.tool": {
"version": "10.4.0",
"version": "11.1.0",
"commands": [
"slngen"
]
Expand Down
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spelling_exclusion_path = .\eng\spellchecking_exclusions.dic

file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.

[*.{appxmanifest,axml,build,config,csproj,dbml,discomap,dtd,json,jsproj,lsproj,njsproj,nuspec,proj,props,resjson,resw,resx,StyleCop,targets,tasks,vbproj,yml,xml,xsd}]
[*.{appxmanifest,axml,build,config,proj,csproj,dbml,discomap,dtd,json,jsproj,lsproj,njsproj,nuspec,proj,props,resjson,resw,resx,StyleCop,targets,tasks,vbproj,yml,xml,xsd}]
indent_style = space
indent_size = 2
tab_width = 2
11 changes: 0 additions & 11 deletions .github/fabricbot.json
Original file line number Diff line number Diff line change
Expand Up @@ -565,17 +565,6 @@
},
"disabled": false
},
{
"taskType": "trigger",
"capabilityId": "ReleaseAnnouncement",
"subCapability": "ReleaseAnnouncement",
"version": "1.0",
"config": {
"taskName": "Release announcement",
"prReply": "The fix is included in ${pkgName} ${version}.",
"issueReply": "Fixed in ${pkgName} ${version}."
}
},
{
"taskType": "trigger",
"capabilityId": "InPrLabel",
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

<PropertyGroup>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<LangVersion>preview</LangVersion>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>disable</ImplicitUsings>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<NoWarn>$(NoWarn);AD0001</NoWarn>

<!-- Experimental warnings are for customers, not for this repo -->
<NoWarn>$(NoWarn);EXTEXP0001;EXTEXP0002;EXTEXP0003;EXTEXP0004;EXTEXP0005;EXTEXP0006;EXTEXP0007;EXTEXP0008;EXTEXP0009;EXTEXP0010;EXTEXP0011;EXTEXP0012</NoWarn>
<NoWarn>$(NoWarn);EXTEXP0001;EXTEXP0002;EXTEXP0003;EXTEXP0004;EXTEXP0005;EXTEXP0006;EXTEXP0007;EXTEXP0008;EXTEXP0009;EXTEXP0010;EXTEXP0011;EXTEXP0012;EXTEXP0013</NoWarn>

<!-- NU5104: A stable release of a package should not have a prerelease dependency -->
<NoWarn>$(NoWarn);NU5104</NoWarn>
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ This project has adopted the code of conduct defined by the [Contributor Covenan

General .NET OSS discussions: [.NET Foundation Discussions](https://github.com/dotnet-foundation/Home/discussions)

## Code of Conduct

This project uses the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct) to define expected conduct in our community. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at conduct@dotnetfoundation.org.

## License

.NET (including the runtime repo) is licensed under the [MIT](LICENSE.TXT) license.
3 changes: 2 additions & 1 deletion docs/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ This sets up necessary environmental variables and opens the repository in VS Co
* Windows Forms uses Visual Studio MSBuild but for certain features we require the latest MSBuild from .NET Core/.NET SDK. If you are on an official version of [Visual Studio][VS-download] (i.e. not a Preview version), then you may need to enable previews for .NET Core/.NET SDKs in VS.
* you can do this in VS under Tools->Options->Environment->Preview Features->Use previews of the .Net Core SDK (Requires restart)
* When restoring packages, if you get the following message: "The SSL connection could not be established, see inner exception. Unable to read data from the transport connection", try disabling IPv6 on your network adapter.

* When the public API surface is updated, you need to update the API baselines manifest files for the impacted assemblies. [Here is an example](https://github.com/dotnet/extensions/blob/3e6ac0735cb62d4c8b63e131d956397a87ea26f7/src/Libraries/Microsoft.Extensions.AsyncState/Microsoft.Extensions.AsyncState.json) for the `Microsoft.Extensions.AsyncState` project. To update the manifest of all the local assemblies, invoke the script `./scripts/MakeApiBaselines.ps1`.
```
---
1. **"Solution"** means the collections of projects specified in `eng/build.proj` or an actual "sln" file at the root of the repository that represents the generated "filtered" solution (e.g., `SDK.sln`).
Expand Down
1 change: 1 addition & 0 deletions docs/list-of-diagnostics.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ if desired.
| `EXTEXP0010` | Object pool experiments |
| `EXTEXP0011` | Document database experiments |
| `EXTEXP0012` | Auto-activation experiments |
| `EXTEXP0013` | HttpLogging middleware experiments |
5 changes: 5 additions & 0 deletions eng/MSBuild/Packaging.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup>
<!-- Similar to https://github.com/dotnet/arcade/blob/main/src/Microsoft.DotNet.Arcade.Sdk/tools/RepoLayout.props#L48 -->
<SrcLibrariesDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'Libraries'))</SrcLibrariesDir>
</PropertyGroup>

<!-- strong name signing control -->
<PropertyGroup Condition="'$(SignArtifacts)' == 'true' ">
<DelaySign>true</DelaySign>
Expand Down
2 changes: 1 addition & 1 deletion eng/MSBuild/ProjectStaging.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<!-- Produce errors if we don't have all the right properties defined -->
<Target Name="_CheckPropsExist" Condition="'$(Stage)' != ''" BeforeTargets="Build">
<Target Name="_CheckPropsExist" Condition="'$(Stage)' != '' and $(Stage) != 'transport'" BeforeTargets="Build">
<Error Condition="'$(Stage)' != 'dev' AND '$(Stage)' != 'normal' AND '$(Stage)' != 'obsolete'" Text="Stage property must be dev|normal|obsolete" />
<Error Condition="'$(Description)' == ''" Text="Missing Description property." />
<Error Condition="'$(Workstream)' == ''" Text="Missing Workstream property." />
Expand Down
Loading

0 comments on commit 23b1714

Please sign in to comment.