diff options
author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-06-21 08:46:09 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-21 08:46:09 -0700 |
commit | a576c83b0401fcfcc9e47e5cd3dcbe4c13871f58 (patch) | |
tree | 42caeef2b6a6ea6d64159ae11a18e39c83c89c8e | |
parent | cb0bb4e65ee1d2af116e3fb4e2dca116ae56fc03 (diff) | |
parent | af7598e06f0df2a2df4894bbdfb5eb36b9dabb0d (diff) | |
download | coreclr-a576c83b0401fcfcc9e47e5cd3dcbe4c13871f58.tar.gz coreclr-a576c83b0401fcfcc9e47e5cd3dcbe4c13871f58.tar.bz2 coreclr-a576c83b0401fcfcc9e47e5cd3dcbe4c13871f58.zip |
Merge pull request #5887 from gkhanna79/Fix5883
Update Prerelease version to Beta and increment patch version.
4 files changed, 8 insertions, 14 deletions
@@ -138,7 +138,7 @@ <!-- Packaging properties --> <PropertyGroup> - <PreReleaseLabel>rc4</PreReleaseLabel> + <PreReleaseLabel>beta</PreReleaseLabel> <PackageDescriptionFile>$(SourceDir).nuget/descriptions.json</PackageDescriptionFile> <PackageLicenseFile>$(SourceDir).nuget/dotnet_library_license.txt</PackageLicenseFile> <PackageThirdPartyNoticesFile>$(SourceDir).nuget/ThirdPartyNotices.txt</PackageThirdPartyNoticesFile> @@ -151,8 +151,8 @@ <ProjectUrl>https://dot.net</ProjectUrl> - <!-- PreReleaseSuffix for TFS win8-arm CoreCLR package --> - <ExternalExpectedPrerelease>rc4-24220-00</ExternalExpectedPrerelease> + <!-- PreReleaseSuffix for packages published from closed build (e.g. CoreCLR for Arm32, APISet, etc) --> + <ExternalExpectedPrerelease>beta-24220-00</ExternalExpectedPrerelease> <!-- On Windows, MSbuild still runs against Desktop FX while it runs on .NET Core on non-Windows. this requires pulling in different packaging dependencies. diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj index 8df90b1f05..8c8c301101 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -10,9 +10,7 @@ <IncludeRuntimeJson>true</IncludeRuntimeJson> </PropertyGroup> <ItemGroup> - <Dependency Include="Microsoft.NETCore.Runtime.CoreCLR"> - <Version>1.0.2$(VersionSuffix)</Version> - </Dependency> + <ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj" /> <ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj index d251a84e6d..58f1edf5fc 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -10,9 +10,7 @@ <IncludeRuntimeJson>true</IncludeRuntimeJson> </PropertyGroup> <ItemGroup> - <Dependency Include="Microsoft.NETCore.Runtime.CoreCLR"> - <Version>1.0.2$(VersionSuffix)</Version> - </Dependency> + <ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj" /> <ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj"> <Platform>amd64</Platform> </ProjectReference> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 00f824db31..53bfbba0ab 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -13,16 +13,14 @@ <!-- Declare a runtime dependency on the win8-arm CoreCLR built using the TFS builds --> <RuntimeDependency Include="runtime.win8-arm.Microsoft.NETCore.Runtime.CoreCLR"> <TargetRuntime>win8-arm</TargetRuntime> - <Version>1.0.2-$(ExternalExpectedPrerelease)</Version> + <Version>1.0.3-$(ExternalExpectedPrerelease)</Version> </RuntimeDependency> <!-- ApiSets are only applicable for Windows. Despite the unconditioned package dependency it is constrained by runtime IDs within it's own package --> <Dependency Include="Microsoft.NETCore.Windows.ApiSets"> - <Version>1.0.1-rc3-23915</Version> - </Dependency> - <Dependency Include="Microsoft.NETCore.Jit"> - <Version>1.0.2$(VersionSuffix)</Version> + <Version>1.0.2-$(ExternalExpectedPrerelease)</Version> </Dependency> + <ProjectReference Include="..\Microsoft.NETCore.Jit\Microsoft.NETCore.Jit.pkgproj" /> <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> <Platform>amd64</Platform> </ProjectReference> |