Skip to content

Commit

Permalink
Merge branch 'main' into resolve-asset-path-by-locatefile
Browse files Browse the repository at this point in the history
  • Loading branch information
@yamachu
yamachu committed Jun 30, 2022
2 parents 527ad98 + 85223ce commit cf45c0d
Show file tree
Hide file tree
Showing 1,209 changed files with 13,187 additions and 14,212 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.22320.3",
"version": "1.0.0-prerelease.22329.1",
"commands": [
"xharness"
]
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Project maintainers will merge changes that improve the product significantly an

Maintainers will not merge changes that have narrowly-defined benefits, due to compatibility risk. The .NET Core codebase is used by several Microsoft products (for example, ASP.NET Core, .NET Framework 4.x, Windows Universal Apps) to enable execution of managed code. Other companies are building products on top of .NET, too. We may revert changes if they are found to be breaking.

Contributions must also satisfy the other published guidelines defined in this document.
Contributions must also satisfy the other published guidelines defined in this document as well as in [pr-guide docs](docs/pr-guide.md).

### DOs and DON'Ts

Expand Down
1 change: 1 addition & 0 deletions docs/pr-guide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ To merge pull requests, you must have write permissions in the repository. If yo
* All changes should follow the existing code style. You can read more about different code styles at [docs/coding-guidelines](coding-guidelines/).
* Use Draft pull requests for changes you are still working on but want early CI loop feedback. When you think your changes are ready for review, [change the status](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/changing-the-stage-of-a-pull-request) of your pull request.
* Avoid rebasing your changes. If you are asked to make changes during the review process do them as a new commit.
* To resolve merge conflicts, use "merge" instead of "rebase".

## Pull Request Ownership

Expand Down
28 changes: 14 additions & 14 deletions docs/project/dogfooding.md
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Dogfooding nightly builds of .NET
# Dogfooding daily builds of .NET

This document provides the steps necessary to consume a nightly build of .NET runtime and SDK.
This document provides the steps necessary to consume a latest development build of .NET runtime and SDK.
Example below is for 7.0 but similar steps should work for other versions as well.

## Obtaining nightly builds of NuGet packages
## Obtaining daily builds of NuGet packages

If you are only looking to get fixes for an individual NuGet package, and don't need a preview version of the entire runtime, you can add the nightly build package feed to your `NuGet.config` file. The easiest way to do this is by using the dotnet CLI:
If you are only looking to get fixes for an individual NuGet package, and don't need a preview version of the entire runtime, you can add the development package feed to your `NuGet.config` file. The easiest way to do this is by using the dotnet CLI:

**(Recommended)** Create a local NuGet.Config file for your solution, if don't already have one. Using a local NuGet.Config file will enable the nightly feed as a package source for projects in the current directory only.
**(Recommended)** Create a local NuGet.Config file for your solution, if don't already have one. Using a local NuGet.Config file will enable the development feed as a package source for projects in the current directory only.
```
dotnet new nugetconfig
```
Expand All @@ -24,11 +24,11 @@ Then, you will be able to add the latest prerelease version of the desired packa
dotnet add package System.Data.OleDb -v 7.0-preview.5.22226.4
```

To use nightly builds of the entire runtime, follow the steps given in the rest of this document instead.
To use daily builds of the entire runtime, follow the steps given in the rest of this document instead.

## Install prerequisites

1. Acquire the latest nightly .NET SDK by downloading and extracting a zip/tarball or using an installer from the [installers and binaries table in dotnet/installer](https://github.com/dotnet/installer#installers-and-binaries) (for example, https://aka.ms/dotnet/7.0/daily/dotnet-sdk-win-x64.zip).
1. Acquire the latest development .NET SDK by downloading and extracting a zip/tarball or using an installer from the [installers and binaries table in dotnet/installer](https://github.com/dotnet/installer#installers-and-binaries) (for example, https://aka.ms/dotnet/7.0/daily/dotnet-sdk-win-x64.zip).

2. If you are using a local copy of the dotnet CLI, take care that when you type `dotnet` you do not inadvertently pick up a different copy that you may have in your path. On Windows, for example, if you use a Command Prompt, a global copy may be in the path, so use the fully qualified path to your local `dotnet` (e.g. `C:\dotnet\dotnet.exe`). If you receive an error "error NETSDK1045: The current .NET SDK does not support targeting .NET 7.0." then you may be executing an older `dotnet`.

Expand Down Expand Up @@ -68,7 +68,7 @@ Learn about .NET Runtimes and SDKs:
```

3. Our nightly builds are uploaded to nightly feed, not NuGet - so ensure the nightly feed is in your nuget configuration in case you need other packages that aren't included in the download. For example, on Windows you could edit `%userprofile%\appdata\roaming\nuget\nuget.config` or on Linux edit `~/.nuget/NuGet/NuGet.Config` to add these lines:
3. Our daily builds are uploaded to development feed, not NuGet - so ensure the development feed is in your nuget configuration in case you need other packages that aren't included in the download. For example, on Windows you could edit `%userprofile%\appdata\roaming\nuget\nuget.config` or on Linux edit `~/.nuget/NuGet/NuGet.Config` to add these lines:
```xml
<packageSources>
<add key="dotnet7" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet7/nuget/v3/index.json" />
Expand Down Expand Up @@ -97,11 +97,11 @@ $ dotnet run

Rinse and repeat!

## Advanced Scenario - Using a nightly build of Microsoft.NETCore.App
## Advanced Scenario - Using a daily build of Microsoft.NETCore.App

When using the above instructions, your application will run against the same
.NET runtime that comes with the SDK. That works fine to get up and
running quickly. However, there are times when you need to use a nightly build
running quickly. However, there are times when you need to use a daily build
of Microsoft.NETCore.App which hasn't made its way into the SDK yet. To enable
this, there are two options you can take.

Expand All @@ -110,8 +110,8 @@ this, there are two options you can take.
This is the default case for applications - running against an installed .NET runtime.

1. You still need to install the prerequisite .NET SDK from above.
2. Optionally, install the specific .NET runtime you require globally or download get the latest one available from the [nightly build table](#nightly-builds-table)
3. Modify your .csproj to reference the nightly build of Microsoft.NETCore.App
2. Optionally, install the specific .NET runtime you require globally or download get the latest one available from the [daily build table](#daily-builds-table)
3. Modify your .csproj to reference the daily build of Microsoft.NETCore.App

```XML
<PropertyGroup>
Expand All @@ -133,7 +133,7 @@ $ dotnet run
In this case, the .NET runtime will be published along with your application.

1. You still need to install the prerequisite .NET SDK from above.
2. Modify your .csproj to reference the nightly build of Microsoft.NETCore.App *and*
2. Modify your .csproj to reference the daily build of Microsoft.NETCore.App *and*
make it self-contained by adding a RuntimeIdentifier (RID).

```XML
Expand All @@ -154,7 +154,7 @@ $ dotnet publish
$ bin\Debug\net7.0\win-x64\publish\App.exe
```

### Nightly builds table
### Daily builds table

<!--
To update this table, run 'build.sh/cmd RegenerateDownloadTable'. See
Expand Down
2 changes: 1 addition & 1 deletion docs/workflow/requirements/windows-requirements.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ The dotnet/runtime repository requires at least Git 2.22.0.

While not strictly needed to build or test this repository, having the .NET SDK installed lets you browse solution files in this repository with Visual Studio and use the dotnet.exe command to run .NET applications in the 'normal' way.
We use this in the [Using Your Build](../testing/using-your-build.md) instructions.
The minimum required version of the SDK is specified in the [global.json file](https://github.com/dotnet/runtime/blob/main/global.json#L3). [You can find the installers and binaries for nightly builds of .NET SDK here](https://github.com/dotnet/installer#installers-and-binaries).
The minimum required version of the SDK is specified in the [global.json file](https://github.com/dotnet/runtime/blob/main/global.json#L3). [You can find the installers and binaries for latest development builds of .NET SDK here](https://github.com/dotnet/installer#installers-and-binaries).

Alternatively, to avoid modifying your machine state, you can use the repository's locally acquired SDK by passing in the solution to load via the `-vs` switch:

Expand Down
2 changes: 1 addition & 1 deletion docs/workflow/testing/using-your-build.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ standard 'dotnet' host that installs with .NET SDK.
The released version of 'dotnet' tool may not be compatible with the live repository. The following steps
assume use of a dogfood build of the .NET SDK.

## Acquire the latest nightly .NET SDK
## Acquire the latest development .NET SDK

- [Win 64-bit Latest](https://aka.ms/dotnet/6.0/daily/dotnet-sdk-win-x64.zip)
- [macOS 64-bit Latest](https://aka.ms/dotnet/6.0/daily/dotnet-sdk-osx-x64.tar.gz)
Expand Down
2 changes: 1 addition & 1 deletion docs/workflow/using-dotnet-cli.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ All paths in examples below are Windows-style but the procedure is otherwise exa

If you don't have this folder, you may have built binaries but not packages. Try building from the root with a command like `build.cmd clr+libs+host+packs -c release`.

2. Acquired the latest nightly .NET SDK from [here](https://github.com/dotnet/installer) and added its root folder to your [path](requirements/windows-requirements.md#adding-to-the-default-path-variable)
2. Acquired the latest development .NET SDK from [here](https://github.com/dotnet/installer) and added its root folder to your [path](requirements/windows-requirements.md#adding-to-the-default-path-variable)

## First Run

Expand Down
24 changes: 21 additions & 3 deletions eng/CodeAnalysis.src.globalconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1445,9 +1445,6 @@ dotnet_diagnostic.IDE0048.severity = silent
# IDE0049: Use language keywords instead of framework type names for type references
dotnet_diagnostic.IDE0049.severity = warning

# IDE0050: Convert anonymous type to tuple
dotnet_diagnostic.IDE0050.severity = suggestion

# IDE0051: Remove unused private members
dotnet_diagnostic.IDE0051.severity = suggestion

Expand Down Expand Up @@ -1569,6 +1566,27 @@ dotnet_diagnostic.IDE0160.severity = silent
# IDE0161: Convert to file-scoped namespace
dotnet_diagnostic.IDE0161.severity = silent

# IDE0170: Simplify property pattern
dotnet_diagnostic.IDE0170.severity = warning

# IDE0180: Use tuple swap
dotnet_diagnostic.IDE0180.severity = suggestion

# IDE0200: Remove unnecessary lambda expression
dotnet_diagnostic.IDE0200.severity = warning

# IDE0210: Use top-level statements
dotnet_diagnostic.IDE0210.severity = silent

# IDE0211: Use program main
dotnet_diagnostic.IDE0211.severity = silent

# IDE0220: foreach cast
dotnet_diagnostic.IDE0220.severity = silent

# IDE0230: Use UTF8 string literal
dotnet_diagnostic.IDE0230.severity = suggestion

# IDE1005: Delegate invocation can be simplified.
dotnet_diagnostic.IDE1005.severity = warning

Expand Down
24 changes: 21 additions & 3 deletions eng/CodeAnalysis.test.globalconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1440,9 +1440,6 @@ dotnet_diagnostic.IDE0048.severity = silent
# IDE0049: Use language keywords instead of framework type names for type references
dotnet_diagnostic.IDE0049.severity = silent

# IDE0050: Convert anonymous type to tuple
dotnet_diagnostic.IDE0050.severity = silent

# IDE0051: Remove unused private members
dotnet_diagnostic.IDE0051.severity = silent

Expand Down Expand Up @@ -1563,6 +1560,27 @@ dotnet_diagnostic.IDE0160.severity = silent
# IDE0161: Convert to file-scoped namespace
dotnet_diagnostic.IDE0161.severity = silent

# IDE0170: Simplify property pattern
dotnet_diagnostic.IDE0170.severity = silent

# IDE0180: Use tuple swap
dotnet_diagnostic.IDE0180.severity = silent

# IDE0200: Remove unnecessary lambda expression
dotnet_diagnostic.IDE0200.severity = silent

# IDE0210: Use top-level statements
dotnet_diagnostic.IDE0210.severity = silent

# IDE0211: Use program main
dotnet_diagnostic.IDE0211.severity = silent

# IDE0220: foreach cast
dotnet_diagnostic.IDE0220.severity = silent

# IDE0230: Use UTF8 string literal
dotnet_diagnostic.IDE0230.severity = silent

# IDE1005: Delegate invocation can be simplified.
dotnet_diagnostic.IDE1005.severity = silent

Expand Down

0 comments on commit cf45c0d

Please sign in to comment.