Skip to content

Commit

Permalink
Merge pull request #55030 from allisonchou/merge-17.0-vs-deps-to-main-p2
Browse files Browse the repository at this point in the history
Merge release/dev17.0-vs-deps to main
  • Loading branch information
allisonchou authored Jul 23, 2021
2 parents 28b9b16 + 63fc7ef commit c795216
Show file tree
Hide file tree
Showing 450 changed files with 947 additions and 1,379 deletions.
1 change: 1 addition & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
<add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- job: VS_Integration
pool:
name: NetCorePublic-Pool
queue: $(queueName)
queue: BuildPool.Windows.Amd64.VS2022.Pre.Open
strategy:
maxParallel: 4
matrix:
Expand Down
12 changes: 7 additions & 5 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,13 @@ stages:
displayName: Build and Test

jobs:
- template: /eng/common/templates/job/onelocbuild.yml
parameters:
CreatePr: false
LclSource: lclFilesfromPackage
LclPackageId: 'LCL-JUNO-PROD-ROSLYN'
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev16.11-vs-deps') }}:
- template: /eng/common/templates/job/onelocbuild.yml
parameters:
MirrorRepo: roslyn
MirrorBranch: release/dev16.11-vs-deps
LclSource: lclFilesfromPackage
LclPackageId: 'LCL-JUNO-PROD-ROSLYN'

- template: eng/common/templates/jobs/source-build.yml

Expand Down
2 changes: 1 addition & 1 deletion docs/compilers/Compiler Toolset NuPkgs.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ older version of MSBuild. For example using Microsoft.Net.Compilers.Toolset
3.5 (C# 8) inside MSBuild 15 is explicitly not a supported scenario.

Customers who want to use the compiler as a part of their supported build
infrastructure should use the [Visual Studio Build Tools SKU](https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2019])
infrastructure should use the [Visual Studio Build Tools SKU](https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022])
) or [.NET SDK](https://dotnet.microsoft.com/download/visual-studio-sdks)

## NuPkg Installation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Using the command line, Roslyn can be developed using the following pattern:

The minimal required version of .NET Framework is 4.7.2.

## Developing with Visual Studio 2019
## Developing with Visual Studio 2022

1. [Visual Studio 2019 16.9](https://visualstudio.microsoft.com/downloads/)
1. [Visual Studio 2022 17.0 Preview](https://visualstudio.microsoft.com/vs/preview/vs2022/)
- Ensure C#, VB, MSBuild, .NET Core and Visual Studio Extensibility are included in the selected work loads
- Ensure Visual Studio is on Version "16.9" or greater
- Ensure Visual Studio is on Version "17.0" or greater
- Ensure "Use previews of the .NET Core SDK" is checked in Tools -> Options -> Environment -> Preview Features
- Restart Visual Studio
1. [.NET 6.0 Preview 3 SDK](https://dotnet.microsoft.com/download/dotnet-core/6.0) [Windows x64 installer](https://dotnet.microsoft.com/download/dotnet/thank-you/sdk-6.0.100-preview.3-windows-x64-installer)
Expand All @@ -37,7 +37,7 @@ There are a number of options for running the core Roslyn unit tests:

The Test.cmd script will run our unit test on already built binaries. It can be passed the `-build` argument to force a new build before running tests.

1. Run the "Developer Command Prompt for VS2019" from your start menu.
1. Run the "Developer Command Prompt for VS2022" from your start menu.
2. Navigate to the directory of your Git clone.
3. Run `Test.cmd` in the command prompt.

Expand Down
2 changes: 1 addition & 1 deletion docs/wiki/Building-Testing-and-Debugging.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Here are the main branches you should know about:

| Branch | |
| ------ | ----- |
| [**main**](https://github.com/dotnet/roslyn/tree/main) | Our primary branch. Changes here currently target Visual Studio 2019 16.4. If in doubt, this is where you should work, and submit pull requests. <br/>[Instructions for Building on Windows](https://github.com/dotnet/roslyn/blob/main/docs/contributing/Building,%20Debugging,%20and%20Testing%20on%20Windows.md) <br/>[Instructions for Building on Linux and Mac](https://github.com/dotnet/roslyn/blob/main/docs/infrastructure/cross-platform.md) |
| [**main**](https://github.com/dotnet/roslyn/tree/main) | Our primary branch. Changes here currently target Visual Studio 2022 17.0. If in doubt, this is where you should work, and submit pull requests. <br/>[Instructions for Building on Windows](https://github.com/dotnet/roslyn/blob/main/docs/contributing/Building,%20Debugging,%20and%20Testing%20on%20Windows.md) <br/>[Instructions for Building on Linux and Mac](https://github.com/dotnet/roslyn/blob/main/docs/infrastructure/cross-platform.md) |

## Known Issues
Please see the [known contributor issues](https://github.com/dotnet/roslyn/labels/Contributor%20Pain) that you might encounter contributing to Roslyn. If you issue isn't listed, please file it.
4 changes: 2 additions & 2 deletions docs/wiki/Diagnosing-Project-System-Build-Errors.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ There are a few ways to tell:
3. If you're using Visual Studio 2015 Update 2 or later, look for warning IDE0006 in the error list:
![IDE0006 error example](images/design-time-build-errors/ide0006.png)

## How do I get log files to diagnose what is happening in Visual Studio 2019?
## How do I get log files to diagnose what is happening in Visual Studio 2022?

1. Install the [Project System Tools Extension from the Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=VisualStudioProductTeam.ProjectSystemTools)
1. Install the [Project System Tools 2022 Extension from the Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=VisualStudioProductTeam.ProjectSystemTools2022)
2. Restart Visual Studio as a part of installing the extension.
3. Close Visual Studio again, find your solution file on disk, and delete the .vs hidden folder that is alongside your solution. You'll have to show hidden files if you don't see it.
4. Open Visual Studio. Don't open your Solution yet.
Expand Down
Loading

0 comments on commit c795216

Please sign in to comment.