Skip to content

Commit 30c3091

Browse files
authored
Brand release/6.0-maui branch appropriately (#61792)
Updated branch used for maui previews and get it building
1 parent e9036b0 commit 30c3091

File tree

9 files changed

+6
-18
lines changed

9 files changed

+6
-18
lines changed

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<MinorVersion>0</MinorVersion>
88
<PatchVersion>1</PatchVersion>
99
<SdkBandVersion>6.0.100</SdkBandVersion>
10-
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
11-
<PreReleaseVersionIteration></PreReleaseVersionIteration>
10+
<PreReleaseVersionLabel>mauipreview</PreReleaseVersionLabel>
11+
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
1212
<!-- Set assembly version to align with major and minor version,
1313
as for the patches and revisions should be manually updated per assembly if it is serviced. -->
1414
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
1515
<!-- Enable to remove prerelease label. -->
16-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
16+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1717
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
1818
<!-- Opt-in/out repo features -->
1919
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>

eng/packaging.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
</Target>
274274

275275
<Target Name="ValidateAssemblyVersionsInRefPack"
276-
Condition="'$(SkipValidateAssemblyVersion)' != 'true' and '$(_AssemblyInTargetingPack)' == 'true' and '$(PreReleaseVersionLabel)' == 'servicing'"
276+
Condition="'$(SkipValidateAssemblyVersion)' != 'true' and '$(_AssemblyInTargetingPack)' == 'true' and ('$(PreReleaseVersionLabel)' == 'servicing' or '$(PreReleaseVersionLabel)' == 'mauipreview')"
277277
AfterTargets="CoreCompile" >
278278
<Error Condition="'$(AssemblyVersion)' != '$(LastReleasedStableAssemblyVersion)'" Text="AssemblyVersion should match last released assembly version $(LastReleasedStableAssemblyVersion)" />
279279
</Target>

src/libraries/Microsoft.Extensions.HostFactoryResolver/src/Microsoft.Extensions.HostFactoryResolver.Sources.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
<IsSourcePackage>true</IsSourcePackage>
1010
<!-- This is non-shipping package. -->
1111
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
12-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
13-
<ServicingVersion>1</ServicingVersion>
1412
<PackageDescription>Internal package for sharing Microsoft.Extensions.Hosting.HostFactoryResolver type.</PackageDescription>
1513
</PropertyGroup>
1614
</Project>

src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
<PackageDescription>Internal transport package to provide aspnetcore with the assemblies from dotnet/runtime that make up the Microsoft.AspNetCore.App shared framework.</PackageDescription>
1414
<!-- Reference elements are missing from the nuspec: https://github.com/NuGet/Home/issues/8684. -->
1515
<NoWarn>$(NoWarn);NU5131</NoWarn>
16-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
17-
<ServicingVersion>$(PatchVersion)</ServicingVersion>
1816
</PropertyGroup>
1917

2018
<ItemGroup>

src/libraries/Microsoft.Internal.Runtime.WindowsDesktop.Transport/src/Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
<PackageDescription>Internal transport package to provide windowsdesktop with the assemblies from dotnet/runtime that make up the Microsoft.WindowsDesktop.App shared framework.</PackageDescription>
1414
<!-- Reference elements are missing from the nuspec: https://github.com/NuGet/Home/issues/8684. -->
1515
<NoWarn>$(NoWarn);NU5131</NoWarn>
16-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
17-
<ServicingVersion>$(PatchVersion)</ServicingVersion>
1816
</PropertyGroup>
1917

2018
<ItemGroup>

src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
<!-- When building from source, ensure the RID we're building for is part of the RID graph -->
2121
<AdditionalRuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalRuntimeIdentifiers);$(OutputRID)</AdditionalRuntimeIdentifiers>
22-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
23-
<ServicingVersion>1</ServicingVersion>
2422
</PropertyGroup>
2523

2624
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

src/libraries/System.IO.Pipelines/src/System.IO.Pipelines.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ Commonly Used Types:
99
System.IO.Pipelines.Pipe
1010
System.IO.Pipelines.PipeWriter
1111
System.IO.Pipelines.PipeReader</PackageDescription>
12-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
13-
<ServicingVersion>1</ServicingVersion>
1412
</PropertyGroup>
1513
<ItemGroup>
1614
<Compile Include="$(CommonPath)System\Threading\Tasks\TaskToApm.cs"

src/libraries/System.Text.Json/src/System.Text.Json.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
<Nullable>enable</Nullable>
1010
<IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
1111
<IsPackable>true</IsPackable>
12-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
13-
<ServicingVersion>1</ServicingVersion>
1412
<PackageDescription>Provides high-performance and low-allocating types that serialize objects to JavaScript Object Notation (JSON) text and deserialize JSON text to objects, with UTF-8 support built-in. Also provides types to read and write JSON text encoded as UTF-8, and to create an in-memory document object model (DOM), that is read-only, for random access of the JSON elements within a structured view of the data.
1513

1614
Commonly Used Types:

src/libraries/workloads-testing.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<Project>
22
<PropertyGroup>
33
<_NuGetConfigForWorkloadInstall>$(ArtifactsBinDir)workload-nuget.config</_NuGetConfigForWorkloadInstall>
4-
<_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</_PackageVersion>
5-
<_PackageVersion Condition="'$(_PackageVersion)' == ''">$(PackageVersion)</_PackageVersion>
64
</PropertyGroup>
75

86
<Target Name="ProvisionSdkForWorkloadTesting"
@@ -93,6 +91,8 @@
9391
</ItemGroup>
9492

9593
<PropertyGroup>
94+
<_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">$(ProductVersion)</_PackageVersion>
95+
<_PackageVersion Condition="'$(_PackageVersion)' == ''">$(PackageVersion)</_PackageVersion>
9696
<!-- Eg. Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm.6.0.0-dev.nupkg -->
9797
<_AOTCrossNuGetPath>$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.AOT.$(NETCoreSdkRuntimeIdentifier).Cross.$(RuntimeIdentifier).$(_PackageVersion).nupkg</_AOTCrossNuGetPath>
9898
</PropertyGroup>

0 commit comments

Comments
 (0)