Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit a576c83

Browse files
authored
Merge pull request #5887 from gkhanna79/Fix5883
Update Prerelease version to Beta and increment patch version.
2 parents cb0bb4e + af7598e commit a576c83

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

dir.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138

139139
<!-- Packaging properties -->
140140
<PropertyGroup>
141-
<PreReleaseLabel>rc4</PreReleaseLabel>
141+
<PreReleaseLabel>beta</PreReleaseLabel>
142142
<PackageDescriptionFile>$(SourceDir).nuget/descriptions.json</PackageDescriptionFile>
143143
<PackageLicenseFile>$(SourceDir).nuget/dotnet_library_license.txt</PackageLicenseFile>
144144
<PackageThirdPartyNoticesFile>$(SourceDir).nuget/ThirdPartyNotices.txt</PackageThirdPartyNoticesFile>
@@ -151,8 +151,8 @@
151151

152152
<ProjectUrl>https://dot.net</ProjectUrl>
153153

154-
<!-- PreReleaseSuffix for TFS win8-arm CoreCLR package -->
155-
<ExternalExpectedPrerelease>rc4-24220-00</ExternalExpectedPrerelease>
154+
<!-- PreReleaseSuffix for packages published from closed build (e.g. CoreCLR for Arm32, APISet, etc) -->
155+
<ExternalExpectedPrerelease>beta-24220-00</ExternalExpectedPrerelease>
156156

157157
<!-- On Windows, MSbuild still runs against Desktop FX while it runs on .NET Core on non-Windows. this requires
158158
pulling in different packaging dependencies.

src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
<IncludeRuntimeJson>true</IncludeRuntimeJson>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<Dependency Include="Microsoft.NETCore.Runtime.CoreCLR">
14-
<Version>1.0.2$(VersionSuffix)</Version>
15-
</Dependency>
13+
<ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj" />
1614
<ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
1715
<Platform>amd64</Platform>
1816
</ProjectReference>

src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
<IncludeRuntimeJson>true</IncludeRuntimeJson>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<Dependency Include="Microsoft.NETCore.Runtime.CoreCLR">
14-
<Version>1.0.2$(VersionSuffix)</Version>
15-
</Dependency>
13+
<ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj" />
1614
<ProjectReference Include="win\Microsoft.NETCore.ILDAsm.pkgproj">
1715
<Platform>amd64</Platform>
1816
</ProjectReference>

src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@
1313
<!-- Declare a runtime dependency on the win8-arm CoreCLR built using the TFS builds -->
1414
<RuntimeDependency Include="runtime.win8-arm.Microsoft.NETCore.Runtime.CoreCLR">
1515
<TargetRuntime>win8-arm</TargetRuntime>
16-
<Version>1.0.2-$(ExternalExpectedPrerelease)</Version>
16+
<Version>1.0.3-$(ExternalExpectedPrerelease)</Version>
1717
</RuntimeDependency>
1818
<!-- ApiSets are only applicable for Windows.
1919
Despite the unconditioned package dependency it is constrained by runtime IDs within it's own package -->
2020
<Dependency Include="Microsoft.NETCore.Windows.ApiSets">
21-
<Version>1.0.1-rc3-23915</Version>
22-
</Dependency>
23-
<Dependency Include="Microsoft.NETCore.Jit">
24-
<Version>1.0.2$(VersionSuffix)</Version>
21+
<Version>1.0.2-$(ExternalExpectedPrerelease)</Version>
2522
</Dependency>
23+
<ProjectReference Include="..\Microsoft.NETCore.Jit\Microsoft.NETCore.Jit.pkgproj" />
2624
<ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj">
2725
<Platform>amd64</Platform>
2826
</ProjectReference>

0 commit comments

Comments
 (0)