Skip to content

Commit 316186a

Browse files
dotnet-maestro-botdagood
dotnet-maestro-bot
authored and
dagood
committed
Update ProdCon to 20180820-01-1963377 (release/2.2) (#694)
* Update ProdCon to 20180820-01-1963377 * Add patch to fix websdk TargetFrameworks override
1 parent 022bfa8 commit 316186a

12 files changed

+58
-14
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/20180815-01/final/index.json
1+
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20180820-01/final/index.json

‎dependencies.props

Lines changed: 4 additions & 4 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>222f28f0e1d1ccc987c574efb500e804d42add74</ProdConCurrentRef>
8+
<ProdConCurrentRef>8cb4f31e7894e4363ff1941a679f01ebe0f07297</ProdConCurrentRef>
99
<CoreClrCurrentRef>293e58e87c0575e7e425a1bab57d5eb0e25d743e</CoreClrCurrentRef>
1010
<BuildToolsCurrentRef>91c9a3b3374ff71e72c06d5773bd26598539aa1d</BuildToolsCurrentRef>
1111
</PropertyGroup>
@@ -28,9 +28,9 @@
2828
the product as version strings to be used by the SDK to fetch extra content.
2929
-->
3030
<PropertyGroup>
31-
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-34992</MicrosoftAspNetCoreAllPackageVersion>
32-
<MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview1-34992</MicrosoftAspNetCoreAppPackageVersion>
33-
<MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-34992</MicrosoftNETSdkRazorPackageVersion>
31+
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-35029</MicrosoftAspNetCoreAllPackageVersion>
32+
<MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview1-35029</MicrosoftAspNetCoreAppPackageVersion>
33+
<MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-35029</MicrosoftNETSdkRazorPackageVersion>
3434
</PropertyGroup>
3535

3636
<ItemGroup>

‎patches/websdk/0001-Fix-DotNetBuildFromSource-framework-override.patch

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
From 646cb1bace928c3392116f6687127b25562e99b6 Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Tue, 21 Aug 2018 14:19:23 -0500
4+
Subject: [PATCH] Fix DotNetBuildFromSource framework override
5+
6+
Makes the override single framework match the usual one. netstandard1.3 was
7+
changed to netcoreapp2.0 for TargetFrameworks, but not the override. This also
8+
required including the override in test project, probably because the change
9+
was from netstandard to netcoreapp which isn't compatible with net46.
10+
11+
https://github.com/aspnet/websdk/issues/398 is required to remove this patch.
12+
---
13+
.../Microsoft.NET.Sdk.Publish.Tasks.csproj | 2 +-
14+
.../Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj | 1 +
15+
2 files changed, 2 insertions(+), 1 deletion(-)
16+
17+
diff --git a/src/Publish/Microsoft.NET.Sdk.Publish.Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj b/src/Publish/Microsoft.NET.Sdk.Publish.Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj
18+
index 72a50d6..2d257e4 100644
19+
--- a/src/Publish/Microsoft.NET.Sdk.Publish.Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj
20+
+++ b/src/Publish/Microsoft.NET.Sdk.Publish.Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj
21+
@@ -8,7 +8,7 @@
22+
23+
<PropertyGroup>
24+
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
25+
- <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.3</TargetFrameworks>
26+
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp2.0</TargetFrameworks>
27+
<PlatformTarget>AnyCPU</PlatformTarget>
28+
<OutputPath>$(WebSdkRoot)\bin\$(Configuration)\</OutputPath>
29+
<IntermediateOutputPath>$(WebSdkRoot)\obj\$(Configuration)\</IntermediateOutputPath>
30+
diff --git a/test/Publish/Microsoft.NET.Sdk.Publish.Tasks.Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj b/test/Publish/Microsoft.NET.Sdk.Publish.Tasks.Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj
31+
index a12de84..a90257c 100644
32+
--- a/test/Publish/Microsoft.NET.Sdk.Publish.Tasks.Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj
33+
+++ b/test/Publish/Microsoft.NET.Sdk.Publish.Tasks.Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj
34+
@@ -1,6 +1,7 @@
35+
<Project Sdk="Microsoft.NET.Sdk">
36+
<PropertyGroup>
37+
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
38+
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp2.0</TargetFrameworks>
39+
<AssemblyName>Microsoft.NET.Sdk.Publish.Tasks.Tests</AssemblyName>
40+
</PropertyGroup>
41+
42+
--
43+
2.17.1.windows.2
44+

‎repos/core-setup.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<BuildArguments Condition="$(Platform.Contains('arm'))">$(BuildArguments) -TargetArchitecture=$(Platform) -DisableCrossgen=true -CrossBuild=true</BuildArguments>
77
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false /p:BuildAllPackages=true</BuildCommand>
88
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
9-
<OfficialBuildId>20180815-03</OfficialBuildId>
9+
<OfficialBuildId>20180820-02</OfficialBuildId>
1010

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

‎repos/coreclr.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) --</BuildCommand>
1111
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
1212
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
13-
<OfficialBuildId>20180815-03</OfficialBuildId>
13+
<OfficialBuildId>20180820-03</OfficialBuildId>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

‎repos/corefx.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
88
<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
99
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
10-
<OfficialBuildId>20180815-03</OfficialBuildId>
10+
<OfficialBuildId>20180820-02</OfficialBuildId>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

‎repos/sdk.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
44
<PropertyGroup>
5-
<OfficialBuildId>20180815.2</OfficialBuildId>
5+
<OfficialBuildId>20180820.1</OfficialBuildId>
66
<OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
77
<BuildCommandArgs>--pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommandArgs>
88

‎src/cli

‎src/core-setup

‎src/coreclr

‎src/corefx

Submodule corefx updated 17 files

‎src/websdk

0 commit comments

Comments
 (0)