Merge branch 'release/3.0' into merge/master-to-release/3.0

11 files changed, 60 insertions, 21 deletions

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 77d108755f..4472d92f43 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,12 +1,21 @@
-variables:
-- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
-  value: true
-
 trigger:
-- master
+  batch: true
+  branches:
+    include:
+    - master
+    - release/3.0
 
 pr:
 - master
+- release/3.0
+
+# Temporarily set a build number format that includes a large revision
+# number that won't conflict with buildpipeline official builds.
+name: $(Date:yyyyMMdd)$(Rev:.7r)
+
+variables:
+- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
+  value: true
 
 jobs:
 
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake
index 19eab4d885..b0f10c3969 100644
--- a/clrdefinitions.cmake
+++ b/clrdefinitions.cmake
@@ -2,7 +2,7 @@ include(clrfeatures.cmake)
 
 # If set, indicates that this is not an officially supported release
 # Keep in sync with IsPrerelease in dir.props
-set(PRERELEASE 1)
+set(PRERELEASE 0)
 
 # Features we're currently flighting, but don't intend to ship in officially supported releases
 if (PRERELEASE)
diff --git a/dependencies.props b/dependencies.props
index b04a88545f..89782fc7ba 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -37,7 +37,7 @@
   <!-- Package dependency verification/auto-upgrade configuration. -->
   <PropertyGroup>
     <BaseDotNetBuildInfo>build-info/dotnet/</BaseDotNetBuildInfo>
-    <DependencyBranch>master</DependencyBranch>
+    <DependencyBranch>release/3.0</DependencyBranch>
     <CurrentRefXmlPath>$(MSBuildThisFileFullPath)</CurrentRefXmlPath>
   </PropertyGroup>
 
diff --git a/dir.props b/dir.props
index 60efbd763f..ab996d57ad 100644
--- a/dir.props
+++ b/dir.props
@@ -33,7 +33,7 @@
     <!-- If true, indicates that this is not an officially supported release -->
     <!-- It is important to flip this to false in official release branches -->
     <!-- Keep it in sync with PRERELEASE in clrdefinitions.cmake -->
-    <IsPrerelease>true</IsPrerelease>
+    <IsPrerelease>false</IsPrerelease>
   </PropertyGroup>
 
   <!-- Output paths -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 001ef78ee4..082590d107 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+
 <Dependencies>
   <ProductDependencies>
   </ProductDependencies>
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index feb58d1419..bd428f333f 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -133,6 +133,8 @@ try {
   Build
 }
 catch {
+  Write-Host $_
+  Write-Host $_.Exception
   Write-Host $_.ScriptStackTrace
   Write-PipelineTelemetryError -Category "InitializeToolset" -Message $_
   ExitWithExitCode 1
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 6236fc4d38..9729655118 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -209,8 +209,9 @@ if [[ -n "${useInstalledDotNetCli:-}" ]]; then
   use_installed_dotnet_cli="$useInstalledDotNetCli"
 fi
 
-if [[ "$restore" == true && -z ${DisableNativeToolsetInstalls:-} ]]; then
-  InitializeNativeTools
-fi
+# Workaround for https://github.com/dotnet/arcade/issues/2673
+# if [[ "$restore" == true && -z ${DisableNativeToolsetInstalls:-} ]]; then
+#  InitializeNativeTools
+# fi
 
 Build
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 60741f0390..bdd87111e4 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -147,10 +147,12 @@ function InitializeDotNetCli([bool]$install) {
   # It also ensures that VS msbuild will use the downloaded sdk targets.
   $env:PATH = "$dotnetRoot;$env:PATH"
 
-  # Make Sure that our bootstrapped dotnet cli is avaliable in future steps of the Azure Pipelines build
-  Write-PipelinePrependPath -Path $dotnetRoot
-  Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
-  Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1'
+  if ($ci) {
+    # Make Sure that our bootstrapped dotnet cli is avaliable in future steps of the Azure Pipelines build
+    Write-Host "##vso[task.prependpath]$dotnetRoot"
+    Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP]0"
+    Write-Host "##vso[task.setvariable variable=DOTNET_SKIP_FIRST_TIME_EXPERIENCE]1"
+  }
 
   return $global:_DotNetInstallDir = $dotnetRoot
 }
@@ -573,8 +575,11 @@ Create-Directory $ToolsetDir
 Create-Directory $TempDir
 Create-Directory $LogDir
 
-Write-PipelineSetVariable -Name 'Artifacts' -Value $ArtifactsDir
-Write-PipelineSetVariable -Name 'Artifacts.Toolset' -Value $ToolsetDir
-Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir
-Write-PipelineSetVariable -Name 'TEMP' -Value $TempDir
-Write-PipelineSetVariable -Name 'TMP' -Value $TempDir
+if ($ci) {
+  Write-Host "##vso[task.setvariable variable=Artifacts]$ArtifactsDir"
+  Write-Host "##vso[task.setvariable variable=Artifacts.Toolset]$ToolsetDir"
+  Write-Host "##vso[task.setvariable variable=Artifacts.Log]$LogDir"
+
+  $env:TEMP = $TempDir
+  $env:TMP = $TempDir
+}
diff --git a/src/vm/eventpipesession.cpp b/src/vm/eventpipesession.cpp
index 8123c7e214..88b5a0f907 100644
--- a/src/vm/eventpipesession.cpp
+++ b/src/vm/eventpipesession.cpp
@@ -75,6 +75,21 @@ EventPipeSession::EventPipeSession(
     QueryPerformanceCounter(&m_sessionStartTimeStamp);
 }
 
+void EventPipeSession::Close()
+{
+    CONTRACTL
+    {
+        NOTHROW;
+        GC_TRIGGERS;
+        MODE_PREEMPTIVE;
+    }
+    CONTRACTL_END;
+
+    // FIXME: **ONLY** closes the stream. This explicitly **LEAKS** the
+    // provider list and buffer manager.
+    delete m_pFile;
+}
+
 EventPipeSession::~EventPipeSession()
 {
     CONTRACTL
diff --git a/src/vm/eventpipesession.h b/src/vm/eventpipesession.h
index 277729354d..9a953b88af 100644
--- a/src/vm/eventpipesession.h
+++ b/src/vm/eventpipesession.h
@@ -104,6 +104,7 @@ public:
         uint32_t numProviders,
         bool rundownEnabled = false);
     ~EventPipeSession();
+    void Close();
 
     uint64_t GetMask() const
     {
diff --git a/tests/issues.targets b/tests/issues.targets
index ae3e8dc754..027d406464 100644
--- a/tests/issues.targets
+++ b/tests/issues.targets
@@ -2,6 +2,12 @@
 <Project DefaultTargets = "GetListOfTestCmds" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <!-- All OS/Arch common excludes -->
     <ItemGroup Condition="'$(XunitTestBinBase)' != ''">
+        <ExcludeList Include="$(XunitTestBinBase)/tracing/eventsource/**/*">	
+            <Issue>24839</Issue>	
+        </ExcludeList>	
+        <ExcludeList Include="$(XunitTestBinBase)/tracing/tracevalidation/**/*">	
+            <Issue>24839</Issue>	
+        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/generics/threadstart/GThread23/*">
             <Issue>19339</Issue>
         </ExcludeList>