projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 34fec92)
Use top level PreReleaseLabel
authorMatt Ellis <matell@microsoft.com>
Sun, 5 Jun 2016 08:38:54 +0000 (01:38 -0700)
committerPat Gavlin <pagavlin@microsoft.com>
Mon, 6 Jun 2016 15:56:54 +0000 (08:56 -0700)
Some projects were overriding PreReleaseLabel instead of inheriting the
parent one in the top level dir.props. In addition, some projects had
the value set to 'rc4' instead of 'rc3'.

Clean this up so we always use the label in the root dir.props

Commit migrated from https://github.com/dotnet/coreclr/commit/7e0579420a0c268e12c7004c116548eb26cc21aa

src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/dir.props patch | blob | history
src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/dir.props patch | blob | history
src/coreclr/src/.nuget/Microsoft.NETCore.Jit/dir.props patch | blob | history

diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/dir.props b/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/dir.props
index 5182fee..068a882 100644 (file)
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/dir.props
+++ b/src/coreclr/src/.nuget/Microsoft.NETCore.ILAsm/dir.props
@@ -4,7 +4,6 @@
 
   <!-- Packaging properties -->
   <PropertyGroup>
-    <PreReleaseLabel>rc4</PreReleaseLabel>
     <PackageDescriptionFile>$(MSBuildThisFileDirectory)descriptions.json</PackageDescriptionFile>
 
     <!-- NOTE: for various required properties, we use the values from the imported dir.props. -->
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/dir.props b/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/dir.props
index 5182fee..068a882 100644 (file)
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/dir.props
+++ b/src/coreclr/src/.nuget/Microsoft.NETCore.ILDAsm/dir.props
@@ -4,7 +4,6 @@
 
   <!-- Packaging properties -->
   <PropertyGroup>
-    <PreReleaseLabel>rc4</PreReleaseLabel>
     <PackageDescriptionFile>$(MSBuildThisFileDirectory)descriptions.json</PackageDescriptionFile>
 
     <!-- NOTE: for various required properties, we use the values from the imported dir.props. -->
diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/dir.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/dir.props
index 5182fee..068a882 100644 (file)
--- a/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/dir.props
+++ b/src/coreclr/src/.nuget/Microsoft.NETCore.Jit/dir.props
@@ -4,7 +4,6 @@
 
   <!-- Packaging properties -->
   <PropertyGroup>
-    <PreReleaseLabel>rc4</PreReleaseLabel>
     <PackageDescriptionFile>$(MSBuildThisFileDirectory)descriptions.json</PackageDescriptionFile>
 
     <!-- NOTE: for various required properties, we use the values from the imported dir.props. -->
Domain: Dotnet / Core;