dotnet · AlekseyTs · Feb 22, 2019 · Dec 10, 2018 · Dec 14, 2018 · Dec 14, 2018
diff --git a/Roslyn.sln b/Roslyn.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27110.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28620.130
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoslynDeployment", "src\Deployment\RoslynDeployment.csproj", "{600AF682-E097-407B-AD85-EE3CED37E680}"
 EndProject
@@ -391,8 +391,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Pack
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Compilers.Setup", "src\Setup\DevDivVsix\CompilersPackage\Microsoft.CodeAnalysis.Compilers.Setup.csproj", "{03607817-6800-40B6-BEAA-D6F437CD62B7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-format", "src\Tools\dotnet-format\dotnet-format.csproj", "{4A9B5423-11BF-4E1D-B231-C9A2FDD78EC4}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Installer.Package", "src\Setup\Installer\Installer.Package.csproj", "{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Workspaces.Desktop.UnitTests", "src\Workspaces\DesktopTest\Microsoft.CodeAnalysis.Workspaces.Desktop.UnitTests.csproj", "{23405307-7EFF-4774-8B11-8F5885439761}"
@@ -1050,10 +1048,6 @@ Global
 		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{03607817-6800-40B6-BEAA-D6F437CD62B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A9B5423-11BF-4E1D-B231-C9A2FDD78EC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A9B5423-11BF-4E1D-B231-C9A2FDD78EC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A9B5423-11BF-4E1D-B231-C9A2FDD78EC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A9B5423-11BF-4E1D-B231-C9A2FDD78EC4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1261,7 +1255,6 @@ Global
 		{3636D3E2-E3EF-4815-B020-819F382204CD} = {BE25E872-1667-4649-9D19-96B83E75A44E}
 		{B9843F65-262E-4F40-A0BC-2CBEF7563A44} = {C52D8057-43AF-40E6-A01B-6CDBB7301985}
 		{03607817-6800-40B6-BEAA-D6F437CD62B7} = {BE25E872-1667-4649-9D19-96B83E75A44E}
-		{4A9B5423-11BF-4E1D-B231-C9A2FDD78EC4} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 		{6A68FDF9-24B3-4CB6-A808-96BF50D1BCE5} = {BE25E872-1667-4649-9D19-96B83E75A44E}
 		{23405307-7EFF-4774-8B11-8F5885439761} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5}
 		{AFA5F921-0650-45E8-B293-51A0BB89DEA0} = {8DBA5174-B0AA-4561-82B1-A46607697753}

@@ -6,6 +6,8 @@ variables:
   SignType: real
   SkipTests: false
   SkipApplyOptimizationData: false
+  IbcSourceBranchName: 'master-vs-deps'
+  IbcDropId: '75e3797e1105a4da4c10dddda76c3b9398f7725a/223453/935479/1'
 
 jobs:
 - job: OfficialBuild
@@ -19,8 +21,6 @@ jobs:
   timeoutInMinutes: 360
 
   variables:
-    VisualStudio.MajorVersion: 16
-    VisualStudio.ChannelName: 'int.d16.0stg'
     VisualStudio.DropName: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
 
   steps:
@@ -59,8 +59,10 @@ jobs:
               -officialBuildId $(Build.BuildNumber)
               -officialSkipTests $(SkipTests)
               -officialSkipApplyOptimizationData $(SkipApplyOptimizationData)
+              -officialSourceBranchName $(Build.SourceBranchName)
+              -officialIbcSourceBranchName $(IbcSourceBranchName)
+              -officialIbcDropId $(IbcDropId)
               /p:RepositoryName=$(Build.Repository.Name)
-              /p:VisualStudioIbcSourceBranchName="master-vs-deps"
               /p:VisualStudioDropAccessToken=$(System.AccessToken)
               /p:VisualStudioDropName=$(VisualStudio.DropName)
               /p:DotNetSignType=$(SignType)
@@ -70,8 +72,6 @@ jobs:
               /p:PublishToSymbolServer=true
               /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
               /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
-              /p:IbcOptimizationDataDir=$(Build.SourcesDirectory)\.o\\
-              /p:VisualStudioIbcDropId=75e3797e1105a4da4c10dddda76c3b9398f7725a/223453/935479/1
     displayName: Build
     condition: succeeded()
 

@@ -81,3 +81,26 @@ Each entry should include a short description of the break, followed by either a
 
 10. Previously, reference assemblies were emitted including embedded resources. In Visual Studio 2019, embedded resources are no longer emitted into ref assemblies.
   See https://github.com/dotnet/roslyn/issues/31197
+
+11. Ref structs now support disposal via pattern. A ref struct enumerator with an accessible `void Dispose()` instance method will now have it invoked at the end of enumeration, regardless of whether the struct type implements IDisposable:
+``` c#
+public class C
+{
+    public ref struct RefEnumerator
+    {
+        public int Current => 0;
+        public bool MoveNext() => false;
+        public void Dispose() => Console.WriteLine("Called in C# 8.0 only");
+    }
+
+    public RefEnumerator GetEnumerator() => new RefEnumerator();
+
+    public static void Main()
+    {
+        foreach(var x in new C())
+        {
+        }
+        // RefEnumerator.Dispose() will be called here in C# 8.0
+    }
+}
+```
diff --git a/docs/features/nullable-reference-types.md b/docs/features/nullable-reference-types.md
@@ -318,6 +318,27 @@ new C?(); // error
 new List<C?>(); // ok
 ```
 
+## Generated code
+Older code generation strategies may not be nullable aware.
+Setting the project-level nullable context to "enable" could result in many warnings that a user is unable to fix.
+To support this scenario any syntax tree that is determined to be generated will have its nullable state implicitly set to "disable", regardless of the overall project state.
+
+A syntax tree is determined to be generated if meets one or more of the following criteria:
+- File name begins with:
+    - TemporaryGeneratedFile_
+- File name ends with:
+    - .designer.cs
+    - .generated.cs
+    - .g.cs
+    - .g.i.cs
+- Contains a top level comment that contains
+    - `<autogenerated`
+    - `<auto-generateed`
+
+Newer, nullable-aware generators, may then opt-in to nullable analysis by including a generated `#nullable enable` at the beginning of the generated code.
+
+Within the context of a generated syntax tree `#nullable restore` will always set the state to "disable".
+
 ## Public APIs
 There are a few questions that an API consumer would want to answer:
 1. should I print a `?` after the type?

@@ -8,6 +8,7 @@ $ErrorActionPreference="Stop"
 
 $VSSetupDir = Join-Path $ArtifactsDir "VSSetup\$configuration"
 $PackagesDir = Join-Path $ArtifactsDir "packages\$configuration"
+$PublishDataUrl = "https://raw.githubusercontent.com/dotnet/roslyn/master/eng/config/PublishData.json"
 
 $binaryLog = if (Test-Path variable:binaryLog) { $binaryLog } else { $false }
 $nodeReuse = if (Test-Path variable:nodeReuse) { $nodeReuse } else { $false }
@@ -22,6 +23,37 @@ function GetProjectOutputBinary([string]$fileName, [string]$projectName = "", [s
   return Join-Path $ArtifactsDir "bin\$projectName\$configuration\$tfm\$ridDir$publishDir$fileName"
 }
 
+function GetPublishData() {
+  if (Test-Path variable:global:_PublishData) {
+    return $global:_PublishData
+  }
+
+  Write-Host "Downloading $PublishDataUrl"
+  $content = (Invoke-WebRequest -Uri $PublishDataUrl -UseBasicParsing).Content
+
+  return $global:_PublishData = ConvertFrom-Json $content
+}
+
+function GetBranchPublishData([string]$branchName) {
+  $data = GetPublishData
+
+  if (Get-Member -InputObject $data.branches -Name $branchName) {
+    return $data.branches.$branchName
+  } else {
+    return $null
+  }
+}
+
+function GetReleasePublishData([string]$releaseName) {
+  $data = GetPublishData
+
+  if (Get-Member -InputObject $data.releases -Name $releaseName) {
+    return $data.releases.$releaseName
+  } else {
+    return $null
+  }
+}
+
 # Handy function for executing a command in powershell and throwing if it 
 # fails.
 #

@@ -46,6 +46,9 @@ param (
     [string]$officialBuildId = "",
     [string]$officialSkipApplyOptimizationData = "",
     [string]$officialSkipTests = "",
+    [string]$officialSourceBranchName = "",
+    [string]$officialIbcSourceBranchName = "",
+    [string]$officialIbcDropId = "",
 
     # Test actions
     [switch]$test32,
@@ -100,6 +103,11 @@ function Print-Usage() {
     Write-Host "  -officialBuildId                            An official build id, e.g. 20190102.3"
     Write-Host "  -officialSkipTests <bool>                   Pass 'true' to not run tests"
     Write-Host "  -officialSkipApplyOptimizationData <bool>   Pass 'true' to not apply optimization data"
+    Write-Host "  -officialSourceBranchName <string>          The source branch name"
+    Write-Host "  -officialIbcDropId <string>                 IBC data drop to use (e.g. '20190210.1/935479/1')."
+    Write-Host "                                              'default' for the most recent available for the branch."
+    Write-Host "  -officialIbcSourceBranchName <string>       IBC source branch (e.g. 'master-vs-deps')"
+    Write-Host "                                              'default' to select branch based on eng/config/PublishData.json."
     Write-Host ""
     Write-Host "Command line arguments starting with '/p:' are passed through to MSBuild."
 }
@@ -133,6 +141,9 @@ function Process-Arguments() {
 
     OfficialBuildOnly "officialSkipTests"
     OfficialBuildOnly "officialSkipApplyOptimizationData"
+    OfficialBuildOnly "officialSourceBranchName"
+    OfficialBuildOnly "officialIbcDropId"
+    OfficialBuildOnly "officialIbcSourceBranchName"
 
     if ($officialBuildId) {
         $script:useGlobalNuGetCache = $false
@@ -195,9 +206,14 @@ function BuildSolution() {
     # PROTOTYPE(DefaultInterfaceImplementation): Added "netcoreapp3.0%3B", original value was "netcoreapp2.1"
     $testTargetFrameworks = if ($testCoreClr) { "netcoreapp3.0%3Bnetcoreapp2.1" } else { "" }
 
-    # Do not set these properties to true explicitly, since that would override values set in projects.
+    $ibcSourceBranchName = GetIbcSourceBranchName
+    $ibcDropId = if ($officialIbcDropId -ne "default") { $officialIbcDropId } else { "" }
+
+    # Do not set this property to true explicitly, since that would override values set in projects.
     $suppressExtensionDeployment = if (!$deployExtensions) { "/p:DeployExtension=false" } else { "" } 
-    $suppressPartialNgenOptimization = if (!$applyOptimizationData) { "/p:ApplyPartialNgenOptimization=false" } else { "" }
+
+    # Workaround for some machines in the AzDO pool not allowing long paths (%5c is msbuild escaped backslash)
+    $ibcDir = Join-Path $RepoRoot ".o%5c"
 
     # Setting /p:TreatWarningsAsErrors=true is a workaround for https://github.com/Microsoft/msbuild/issues/3062.
     # We don't pass /warnaserror to msbuild ($warnAsError is set to $false by default above), but set 
@@ -223,13 +239,62 @@ function BuildSolution() {
         /p:QuietRestoreBinaryLog=$binaryLog `
         /p:TestTargetFrameworks=$testTargetFrameworks `
         /p:TreatWarningsAsErrors=true `
-        $suppressPartialNgenOptimization `
+        /p:VisualStudioIbcSourceBranchName=$ibcSourceBranchName `
+        /p:VisualStudioIbcDropId=$ibcDropId `
+        /p:EnablePartialNgenOptimization=$applyOptimizationData `
+        /p:IbcOptimizationDataDir=$ibcDir `
         $suppressExtensionDeployment `
         @properties
 }
 
+
+# Get the branch that produced the IBC data this build is going to consume.
+# IBC data are only merged in official built, but we want to test some of the logic in CI builds as well.
+function GetIbcSourceBranchName() {
+    if (Test-Path variable:global:_IbcSourceBranchName) {
+      return $global:_IbcSourceBranchName
+    }
+
+    function calculate {
+        $fallback = "master-vs-deps"
+
+        if (!$officialIbcSourceBranchName) {
+            return $fallback
+        }  
+
+        if ($officialIbcSourceBranchName -ne "default") {
+            return $officialIbcSourceBranchName
+        }
+
+        $branchData = GetBranchPublishData $officialSourceBranchName
+        if ($branchData -eq $null) {
+            Write-Host "Warning: Branch $officialSourceBranchName is not listed in PublishData.json. Using IBC data from '$fallback'.  " + `
+                       "Override by setting IbcSourceBranchName build variable." -ForegroundColor Yellow
+            return $fallback
+        }
+
+        if (Test-Member $branchData "ibcSourceBranch") {
+            return $branchData.ibcSourceBranch 
+        }
+
+        return $officialSourceBranchName
+    }
+
+    return $global:_IbcSourceBranchName = calculate
+}
+
 # Set VSO variables used by MicroBuildBuildVSBootstrapper pipeline task
-function Set-OptProfVariables() {
+function SetVisualStudioBootstrapperBuildArgs() {
+    $branchData = GetBranchPublishData (GetIbcSourceBranchName)
+
+    # VS branch name is e.g. "lab/d16.0stg", "rel/d15.9", "lab/ml", etc.
+    $vsBranchSimpleName = $branchData.vsBranch.Split('/')[-1]
+    $vsMajorVersion = $branchData.vsMajorVersion
+    $vsChannel = "int.$vsBranchSimpleName"
+
+    Write-Host "##vso[task.setvariable variable=VisualStudio.MajorVersion;]$vsMajorVersion"        
+    Write-Host "##vso[task.setvariable variable=VisualStudio.ChannelName;]$vsChannel"
+
     $insertionDir = Join-Path $VSSetupDir "Insertion"
     $manifestList = [string]::Join(',', (Get-ChildItem "$insertionDir\*.vsman"))
     Write-Host "##vso[task.setvariable variable=VisualStudio.SetupManifestList;]$manifestList"
@@ -446,7 +511,7 @@ try {
     }
 
     if ($ci -and $build -and $msbuildEngine -eq "vs") {
-        Set-OptProfVariables
+        SetVisualStudioBootstrapperBuildArgs
     }
 
     if ($testDesktop -or $testVsi -or $testIOperation) {

@@ -126,11 +126,6 @@ function Publish-Entry($publishData, [switch]$isBranch) {
     exit 0
 }
 
-function Test-Member($obj, [string]$name) { 
-    $value = Get-Member -Name $name -InputObject $obj 
-    return $value -ne $null
-}
-
 try {
     if ($configuration -eq "") {
         Write-Host "Must provide the build configuration with -configuration"
@@ -141,29 +136,28 @@ try {
 
     $dotnet = Ensure-DotnetSdk
 
-    Write-Host "Downloading PublishData.json"
-    $publishFileContent = (Invoke-WebRequest -Uri "https://raw.githubusercontent.com/dotnet/roslyn/master/eng/config/PublishData.json" -UseBasicParsing).Content
-    $data = ConvertFrom-Json $publishFileContent
-
     if ($branchName -ne "" -and $releaseName -ne "") {
         Write-Host "Can only specify -branchName or -releaseName, not both"
         exit 1
     }
-    elseif ($branchName -ne "") {
-        if (-not (Test-Member $data.branches $branchName)) { 
-            Write-Host "$branchName is not listed for publishing"
+
+    if ($branchName -ne "") {
+        $data = GetBranchPublishData $branchName
+        if ($data -eq $null) {
+            Write-Host "Branch $branchName not listed for publishing."
             exit 0
         }
 
-        Publish-Entry $data.branches.$branchName -isBranch:$true
+        Publish-Entry $data -isBranch:$true
     }
-    elseif ($releaseName -ne "") { 
-        if (-not (Test-Member $data.releases $releaseName)) { 
-           Write-Host "$releaseName is not a valid release"
-           exit 1
+    elseif ($releaseName -ne "") {
+        $data = GetReleasePublishData $releaseName
+        if ($data -eq $null) {
+            Write-Host "Release $releaseName not listed for publishing."
+            exit 1
         }
 
-        Publish-Entry $data.releases.$releaseName -isBranch:$false
+        Publish-Entry $data -isBranch:$false
     }
     else {
         Write-Host "Need to specify -branchName or -releaseName"

@@ -2,18 +2,19 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  <PropertyGroup Condition="'$(CopyrightMicrosoft)' != ''">
+    <Copyright>$(CopyrightMicrosoft)</Copyright>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
   </PropertyGroup>
 
   <PropertyGroup>
     <RepositoryUrl>https://github.com/dotnet/roslyn</RepositoryUrl>
     <RepositoryRawUrl>https://raw.githubusercontent.com/dotnet/roslyn</RepositoryRawUrl>
 
     <!-- Package Settings -->
-    <PackageLicenseUrl>$(RepositoryUrl)/blob/master/License.txt</PackageLicenseUrl>
+    <PackageLicenseUrl Condition="'$(PackageLicenseExpression)' == ''">$(RepositoryUrl)/blob/master/License.txt</PackageLicenseUrl>
     <!-- The SPDX name for the source license. See https://spdx.org/licenses/. -->
-    <PackageLicenseType>Apache-2.0</PackageLicenseType>
+    <PackageLicenseType Condition="'$(PackageLicenseExpression)' == ''">Apache-2.0</PackageLicenseType>
     <PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
     <PackageProjectUrl>https://github.com/dotnet/roslyn</PackageProjectUrl>
     <PackageTags>Roslyn CodeAnalysis Compiler CSharp VB VisualBasic Parser Scanner Lexer Emit CodeGeneration Metadata IL Compilation Scripting Syntax Semantics</PackageTags>