diff options
| author | William Godbe <wigodbe@microsoft.com> | 2019-07-16 15:18:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-16 15:18:18 -0700 |
| commit | 5cdb849a1c59af30aef0b26759b28a101138cdb3 (patch) | |
| tree | d9297eda101507d309b31f3fe635a241756cfa85 | |
| parent | 7f713f7067ffb6adaa1549f626f6bd04128f0de6 (diff) | |
| parent | ac4ab6c990d5ebee49dc03397a2e199241021f26 (diff) | |
| download | coreclr-5cdb849a1c59af30aef0b26759b28a101138cdb3.tar.gz coreclr-5cdb849a1c59af30aef0b26759b28a101138cdb3.tar.bz2 coreclr-5cdb849a1c59af30aef0b26759b28a101138cdb3.zip | |
Merge branch 'release/3.0' into merge/master-to-release/3.0
| -rw-r--r-- | azure-pipelines.yml | 19 | ||||
| -rw-r--r-- | clrdefinitions.cmake | 2 | ||||
| -rw-r--r-- | dependencies.props | 2 | ||||
| -rw-r--r-- | dir.props | 2 | ||||
| -rw-r--r-- | eng/Version.Details.xml | 1 | ||||
| -rw-r--r-- | src/vm/eventpipesession.cpp | 15 | ||||
| -rw-r--r-- | src/vm/eventpipesession.h | 1 | ||||
| -rw-r--r-- | tests/issues.targets | 6 |
8 files changed, 39 insertions, 9 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d3ce6d269b..452fc21507 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 3576844745..22c9c5967f 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 3209bfe66e..774b169ac7 100644 --- a/dependencies.props +++ b/dependencies.props @@ -38,7 +38,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> @@ -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 f5af745618..e19c84199f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> <Dependencies> <ProductDependencies> </ProductDependencies> diff --git a/src/vm/eventpipesession.cpp b/src/vm/eventpipesession.cpp index 8d2ff65fa1..eafac64bb3 100644 --- a/src/vm/eventpipesession.cpp +++ b/src/vm/eventpipesession.cpp @@ -77,6 +77,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 47d40404c9..839ede5b39 100644 --- a/src/vm/eventpipesession.h +++ b/src/vm/eventpipesession.h @@ -108,6 +108,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 b677444f3d..5693737306 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> |