Skip to content

Commit 0824940

Browse files
dagooddagood
authored
[release/2.2] Update to non-final 2.2.0 build (#863)
* Update ProdCon to 20181104-02-2187451 This isn't the final build, but this update gives us a head start. * Predicted submodule changes for 2.2.0 Update cli, sdk, msbuild, aspnet-razor to predicted final build commits. Fix patches. Update nuget to 4.9.0-rtm.5658. Update templating package version. (Submodule commit is still correct, but the package version didn't match.) Update stabilization parameters. * Remove always-changing context from CLI patch * Update baselines for 2.2.0 * Split build and pack for aspnet-razor project If we only do a "pack", the items are resolved before the build happens. Razor has some direct includes of files in "bin", which are missed because compilation hasn't happened yet. Splitting to individual build/pack means that the files are all built when "pack" project evaluation searches for them.
1 parent 9a9dda2 commit 0824940

25 files changed

+69
-111
lines changed

‎ProdConFeed.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20181014-01/final/index.json
1+
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20181104-02/final/index.json

‎dependencies.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
for which dotnet/versions commit was last used to update the dependency.
66
-->
77
<PropertyGroup>
8-
<ProdConCurrentRef>2415b17b695c145fae79c7087549e97cfe641956</ProdConCurrentRef>
8+
<ProdConCurrentRef>a0956f313bca423a1c0e0ee8caf948cbbaf51c14</ProdConCurrentRef>
99
<CoreClrCurrentRef>d2982064838c8c57e1f03ef9211679da72f4fd3a</CoreClrCurrentRef>
1010
<BuildToolsCurrentRef>c45fef92df48cbec1b73a48eb7b06e31b220986b</BuildToolsCurrentRef>
1111
</PropertyGroup>
@@ -22,15 +22,15 @@
2222
the product as version strings to be used by the SDK to fetch extra content.
2323
-->
2424
<PropertyGroup>
25-
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview3-35497</MicrosoftAspNetCoreAllPackageVersion>
26-
<MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview3-35497</MicrosoftAspNetCoreAppPackageVersion>
27-
<MicrosoftNETSdkRazorPackageVersion>2.2.0-preview3-35497</MicrosoftNETSdkRazorPackageVersion>
25+
<MicrosoftAspNetCoreAllPackageVersion>2.2.0</MicrosoftAspNetCoreAllPackageVersion>
26+
<MicrosoftAspNetCoreAppPackageVersion>2.2.0</MicrosoftAspNetCoreAppPackageVersion>
27+
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
2828
</PropertyGroup>
2929

3030
<!-- Build stabilization properties as passed in by ProdCon. -->
3131
<PropertyGroup>
32-
<UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
33-
<VersionStamp Condition="'$(VersionStamp)' == ''">preview3</VersionStamp>
32+
<UseStableVersions Condition="'$(UseStableVersions)' == ''">true</UseStableVersions>
33+
<VersionStamp Condition="'$(VersionStamp)' == ''"></VersionStamp>
3434
</PropertyGroup>
3535

3636
<ItemGroup>
@@ -50,7 +50,7 @@
5050

5151
<DependencyInfo Include="ProdCon" Condition="'$(UpdateFromManifestFile)' == ''">
5252
<DependencyType>Orchestrated build</DependencyType>
53-
<BasePath>build-info/dotnet/product/cli/release/2.2</BasePath>
53+
<BasePath>build-info/dotnet/product/cli/release/2.2.0</BasePath>
5454
<CurrentRef>$(ProdConCurrentRef)</CurrentRef>
5555
<VersionsRepoOwner>dotnet</VersionsRepoOwner>
5656
<VersionsRepo>versions</VersionsRepo>

‎patches/aspnet-razor/0001-Remove-Internal.AspNetCore.Sdk-avoid-prebuilt.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Internal.AspNetCore.Sdk is not used for the very specific build source-build nee
99
1 file changed, 1 deletion(-)
1010

1111
diff --git a/Directory.Build.props b/Directory.Build.props
12-
index 8260b6f3..6a18283d 100644
12+
index 220748df..72a66f01 100644
1313
--- a/Directory.Build.props
1414
+++ b/Directory.Build.props
15-
@@ -20,7 +20,6 @@
15+
@@ -19,7 +19,6 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>

‎patches/aspnet-razor/0002-Add-reference-assemblies-to-allow-net46-build.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ index 02efac45..677ae724 100644
2121
https://vside.myget.org/F/vssdk/api/v3/index.json;
2222
https://vside.myget.org/F/vsmac/api/v3/index.json
2323
diff --git a/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
24-
index a295f16f..4ce6e4fe 100644
24+
index a835c5d0..51df9d45 100644
2525
--- a/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
2626
+++ b/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
27-
@@ -21,6 +21,10 @@
28-
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
27+
@@ -23,6 +23,10 @@
28+
<PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" PrivateAssets="All" />
2929
</ItemGroup>
3030

3131
+ <ItemGroup>
3232
+ <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-alpha-003" PrivateAssets="all" />
3333
+ </ItemGroup>
3434
+
35-
<ItemGroup>
36-
<Compile Include="..\Microsoft.AspNetCore.Razor.Tools\ServerProtocol\*.cs">
37-
<Link>Shared\ServerProtocol\%(FileName)</Link>
35+
<ItemGroup>
36+
<SignedPackageFile Include="$(TargetPath)" PackagePath="tasks/$(TargetFramework)/$(TargetFileName)" Certificate="$(AssemblySigningCertName)" />
37+
</ItemGroup>
3838
--
3939
2.17.1.windows.2
4040

‎patches/cli/0001-Persist-ASP.NET-runtime-patch-targeting-default.patch

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@ https://github.com/dotnet/cli/issues/9469 is required to remove this patch.
1111
1 file changed, 3 insertions(+)
1212

1313
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
14-
index 54bd45b..afa2054 100644
14+
index ebfb1fb6d..ce7f3c174 100644
1515
--- a/build/MSBuildExtensions.targets
1616
+++ b/build/MSBuildExtensions.targets
17-
@@ -237,6 +237,9 @@ Copyright (c) .NET Foundation. All rights reserved.
18-
<LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">1.1.9</LatestPatchVersionForNetCore1_1>
19-
<LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">2.0.9</LatestPatchVersionForNetCore2_0>
20-
<LatestPatchVersionForNetCore2_1 Condition="'%24(LatestPatchVersionForNetCore2_1)' == ''">2.1.2</LatestPatchVersionForNetCore2_1>
17+
@@ -240,3 +240,6 @@ Copyright (c) .NET Foundation. All rights reserved.
2118
+
2219
+ <!-- If true, always target the latest ASP.NET Core runtime by default -->
2320
+ <TargetLatestAspNetCoreRuntimePatch Condition="'$(TargetLatestAspNetCoreRuntimePatch)' == ''">$(DefaultTargetLatestAspNetCoreRuntimePatch)</TargetLatestAspNetCoreRuntimePatch>

‎patches/cli/0002-Ignore-NU5123-build-failure-with-SDK-2.1.402.patch

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎repos/aspnet-razor.proj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77

88
<BuildNumber>35497</BuildNumber>
99

10-
<BuildCommandArgs>pack</BuildCommandArgs>
11-
<BuildCommandArgs>$(BuildCommandArgs) $(RazorSdkProjectFile)</BuildCommandArgs>
10+
<BuildCommandArgs>$(RazorSdkProjectFile)</BuildCommandArgs>
1211
<BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
1312
<BuildCommandArgs>$(BuildCommandArgs) /p:IsFinalBuild=$(UseStableVersions)</BuildCommandArgs>
1413
<BuildCommandArgs>$(BuildCommandArgs) /p:BuildNumber=$(BuildNumber)</BuildCommandArgs>
15-
<BuildCommandArgs>$(BuildCommandArgs) /bl</BuildCommandArgs>
1614

17-
<BuildCommand>$(DotnetToolCommand) $(BuildCommandArgs)</BuildCommand>
15+
<BuildCommand>$(DotnetToolCommand) build /bl:build.binlog $(BuildCommandArgs)</BuildCommand>
16+
17+
<BuildPackagesCommand>$(DotnetToolCommand) pack /bl:pack.binlog $(BuildCommandArgs)</BuildPackagesCommand>
1818

1919
<PackagesOutput>$(RazorSdkProjectDir)bin/$(Configuration)/</PackagesOutput>
2020

‎repos/core-setup.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
2323
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
2424

25-
<OfficialBuildId>20181014-02</OfficialBuildId>
25+
<OfficialBuildId>20181104-04</OfficialBuildId>
2626

2727
<!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
2828
<PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>

‎repos/coreclr.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
2020

2121
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
22-
<OfficialBuildId>20181014-03</OfficialBuildId>
22+
<OfficialBuildId>20181104-03</OfficialBuildId>
2323
</PropertyGroup>
2424

2525
<ItemGroup>

‎repos/corefx.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
2424
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
25-
<OfficialBuildId>20181014-02</OfficialBuildId>
25+
<OfficialBuildId>20181104-04</OfficialBuildId>
2626
</PropertyGroup>
2727

2828
<ItemGroup>

0 commit comments

Comments
 (0)