Skip to content

Commit

Permalink
Merge pull request #49365 from sharwell/update-code-style
Browse files Browse the repository at this point in the history
Update build references to 3.8.0
  • Loading branch information
sharwell committed Nov 21, 2020
2 parents 278127f + 7d87543 commit 0f51eb4
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ The minimal required version of .NET Framework is 4.7.2.

## Developing with Visual Studio 2019

1. [Visual Studio 2019 16.8p2](https://visualstudio.microsoft.com/downloads/)
1. [Visual Studio 2019 16.8](https://visualstudio.microsoft.com/downloads/)
- Ensure C#, VB, MSBuild, .NET Core and Visual Studio Extensibility are included in the selected work loads
- Ensure Visual Studio is on Version "16.8 Preview 3" or greater
- Ensure Visual Studio is on Version "16.8" or greater
- Ensure "Use previews of the .NET Core SDK" is checked in Tools -> Options -> Environment -> Preview Features
- Restart Visual Studio
1. [.NET Core SDK 5.0 Release Candidate 2](https://dotnet.microsoft.com/download/dotnet-core/5.0) [Windows x64 installer](https://dotnet.microsoft.com/download/dotnet/thank-you/sdk-5.0.100-rc.2-windows-x64-installer)
1. [.NET Core SDK 5.0](https://dotnet.microsoft.com/download/dotnet-core/5.0) [Windows x64 installer](https://dotnet.microsoft.com/download/dotnet/thank-you/sdk-5.0.100-windows-x64-installer)
1. [PowerShell 5.0 or newer](https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-windows-powershell). If you are on Windows 10, you are fine; you'll only need to upgrade if you're on earlier versions of Windows. The download link is under the ["Upgrading existing Windows PowerShell"](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-windows-powershell?view=powershell-6#upgrading-existing-windows-powershell) heading.
1. Run Restore.cmd
1. Open Roslyn.sln
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
</MajorVersion>
<MinorVersion>
</MinorVersion>
<MicrosoftNetCompilersToolsetVersion>3.9.0-2.20559.8</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetVersion>3.9.0-2.20570.24</MicrosoftNetCompilersToolsetVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Versions used by several individual references below -->
<RoslynDiagnosticsNugetPackageVersion>3.3.2-beta1.20528.2</RoslynDiagnosticsNugetPackageVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>5.0.0-rc2.20453.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.20407.3</MicrosoftCodeAnalysisTestingVersion>
<CodeStyleAnalyzerVersion>3.8.0-2.20414.4</CodeStyleAnalyzerVersion>
<CodeStyleAnalyzerVersion>3.8.0</CodeStyleAnalyzerVersion>
<VisualStudioEditorPackagesVersion>16.8.181</VisualStudioEditorPackagesVersion>
<ILToolsPackageVersion>5.0.0-alpha1.19409.1</ILToolsPackageVersion>
<MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>16.9.43</MicrosoftVisualStudioLanguageServerProtocolPackagesVersion>
Expand All @@ -39,7 +39,7 @@
repository. This must be lower than MicrosoftNetCompilersToolsetVersion,
but not higher than our minimum dogfoodable Visual Studio version, or else
the generators we build would load on the command line but not load in IDEs. -->
<SourceGeneratorMicrosoftCodeAnalysisVersion>3.8.0-3.final</SourceGeneratorMicrosoftCodeAnalysisVersion>
<SourceGeneratorMicrosoftCodeAnalysisVersion>3.8.0</SourceGeneratorMicrosoftCodeAnalysisVersion>
</PropertyGroup>
<!--
Dependency versions
Expand Down
17 changes: 0 additions & 17 deletions eng/targets/Imports.targets
Original file line number Diff line number Diff line change
Expand Up @@ -168,23 +168,6 @@
Condition="$(_VersionComparisonResult) &lt; 0"/>
</Target>

<!--
Work around missing code fix references causing VBCSCompiler.exe to reject compilations.
https://github.com/dotnet/roslyn/issues/46684
-->
<Target Name="ExcludeCodeFixes"
BeforeTargets="CoreCompile"
Condition="'$(BuildingProject)' == 'true'">
<!--
Disable analyzers that only provide code fixes.
-->
<ItemGroup>
<Analyzer Remove="@(Analyzer)"
Condition="'%(Filename)' == 'Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes'
OR '%(Filename)' == 'Microsoft.VisualStudio.Threading.Analyzers.CodeFixes'"/>
</ItemGroup>
</Target>

<!--
This target is used to copy referenced projects to a sub-directory vs. the direct output
directory of the build. Useful when the referenced project is an EXE and the referencing
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "5.0.100-rc.2.20479.15",
"version": "5.0.100",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "5.0.100-rc.2.20479.15",
"dotnet": "5.0.100",
"vs": {
"version": "16.8"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Interactive/HostProcess/InteractiveHost64.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PropertyGroup>
<Prefer32Bit>false</Prefer32Bit>
<OutputType>Exe</OutputType>
<TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
<TargetFrameworks>net472;net5.0-windows7.0</TargetFrameworks>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<UseWindowsForms>true</UseWindowsForms>

Expand Down
2 changes: 1 addition & 1 deletion src/Interactive/HostTest/InteractiveHost.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</CopyPublishedOutputProjectReference>

<CopyPublishedOutputProjectReference Include="..\HostProcess\InteractiveHost64.csproj">
<SetTargetFramework>TargetFramework=net5.0-windows</SetTargetFramework>
<SetTargetFramework>TargetFramework=net5.0-windows7.0</SetTargetFramework>
<OutputItemType>InteractiveHostFiles_Core</OutputItemType>
</CopyPublishedOutputProjectReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
<ProjectReference Include="..\..\Interactive\HostProcess\InteractiveHost64.csproj">
<Name>InteractiveHost.Core64</Name>

<SetTargetFramework>TargetFramework=net5.0-windows</SetTargetFramework>
<SetTargetFramework>TargetFramework=net5.0-windows7.0</SetTargetFramework>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.CodeAnalysis.UnitTests</RootNamespace>
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net472</TargetFrameworks>
<TargetFrameworks>net5.0-windows7.0;netcoreapp3.1;net472</TargetFrameworks>
<UseWpf>true</UseWpf>
<IsShipping>false</IsShipping>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
Expand Down

0 comments on commit 0f51eb4

Please sign in to comment.