Skip to content

Commit 3f88cca

Browse files
crummeldagood
crummel
authored and
dagood
committed
Upgrade to latest prodcon build and add targeting packs for net46 support (#598)
* Update shas to latest from ProdCon build 20180513-01-1739532 * Another update from ProdCon 20180605-09-17649701. * Add temporary targeting pack patches for MSBuild and NuGet. * Revert unneeded change to MSBuild and NuGet. * Fix patches.
1 parent b98297b commit 3f88cca

13 files changed

+298
-10
lines changed

‎patches/msbuild/0001-Add-TargetingPack-and-enable-net46-builds-for-source.patch

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From 9916195ba908fa5022cbc011f7dac67c5ded5a22 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <crummel@microsoft.com>
3+
Date: Tue, 12 Jun 2018 18:09:27 -0500
4+
Subject: [PATCH] Add TargetingPack and enable net46 builds for source-build.
5+
6+
---
7+
src/Directory.Build.props | 4 ++--
8+
1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
11+
index 5759f5c7..13126316 100644
12+
--- a/src/Directory.Build.props
13+
+++ b/src/Directory.Build.props
14+
@@ -20,8 +20,7 @@
15+
<Platforms>AnyCPU;x64</Platforms>
16+
17+
<!-- Defaults for target frameworks and architecture -->
18+
- <LibraryTargetFrameworks>netstandard2.0</LibraryTargetFrameworks>
19+
- <LibraryTargetFrameworks Condition="'$(OsEnvironment)'=='windows'">net46;netstandard2.0</LibraryTargetFrameworks>
20+
+ <LibraryTargetFrameworks>net46;netstandard2.0</LibraryTargetFrameworks>
21+
<PlatformTarget>AnyCPU</PlatformTarget>
22+
23+
<!-- Target frameworks for Exe and unit test projects (ie projects with runtime output) -->
24+
@@ -62,6 +61,7 @@
25+
<ItemGroup>
26+
<PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" PrivateAssets="All"/>
27+
<PackageReference Condition="'$(DisableNerdbankVersioning)' != 'true'" Include="Nerdbank.GitVersioning" Version="$(GitVersioningVersion)" PrivateAssets="All" />
28+
+ <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-alpha-003" PrivateAssets="all"/>
29+
</ItemGroup>
30+
31+
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
32+
--
33+
2.14.1
34+

‎patches/nuget-client/0001-Add-TargetingPack-and-enable-net46-builds-for-source.patch

Lines changed: 253 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,253 @@
1+
From a0c69929154c148ccbbf5e833c830d3be512df68 Mon Sep 17 00:00:00 2001
2+
From: Chris Rummel <crummel@microsoft.com>
3+
Date: Tue, 12 Jun 2018 18:14:46 -0500
4+
Subject: [PATCH] Add TargetingPack and enable net46 builds for source-build.
5+
6+
---
7+
NuGet.Config | 1 +
8+
build/common.project.props | 4 ++++
9+
src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj | 1 -
10+
src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj | 1 -
11+
src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj | 1 -
12+
src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj | 1 -
13+
src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj | 1 -
14+
src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 1 -
15+
src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj | 1 -
16+
.../NuGet.DependencyResolver.Core.csproj | 1 -
17+
src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj | 1 -
18+
src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj | 1 -
19+
src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj | 1 -
20+
src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj | 3 +--
21+
src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj | 1 -
22+
src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj | 1 -
23+
src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj | 1 -
24+
src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj | 1 -
25+
18 files changed, 6 insertions(+), 17 deletions(-)
26+
27+
diff --git a/NuGet.Config b/NuGet.Config
28+
index 9b7d2ae0a..fc4c20dd9 100644
29+
--- a/NuGet.Config
30+
+++ b/NuGet.Config
31+
@@ -7,6 +7,7 @@
32+
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
33+
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
34+
<add key="dotnet-roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
35+
+ <add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
36+
</packageSources>
37+
<disabledPackageSources>
38+
<clear />
39+
diff --git a/build/common.project.props b/build/common.project.props
40+
index e77304739..fa513587a 100644
41+
--- a/build/common.project.props
42+
+++ b/build/common.project.props
43+
@@ -271,4 +271,8 @@
44+
<ApexProjects Include="$(RepositoryRootDirectory)test\NuGet.Tests.Apex\*\*.csproj" />
45+
</ItemGroup>
46+
47+
+ <ItemGroup>
48+
+ <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-alpha-003" PrivateAssets="all" />
49+
+ </ItemGroup>
50+
+
51+
</Project>
52+
diff --git a/src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj b/src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj
53+
index 3b0f0878f..1fb72a408 100644
54+
--- a/src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj
55+
+++ b/src/NuGet.Clients/NuGet.Credentials/NuGet.Credentials.csproj
56+
@@ -3,7 +3,6 @@
57+
58+
<PropertyGroup>
59+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
60+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
61+
<TargetFramework />
62+
<Shipping>true</Shipping>
63+
<PackProject>true</PackProject>
64+
diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
65+
index 143c460dc..15dee5c95 100644
66+
--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
67+
+++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.csproj
68+
@@ -3,7 +3,6 @@
69+
70+
<PropertyGroup>
71+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
72+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
73+
<NoWarn>$(NoWarn);CS1591</NoWarn>
74+
<AssemblyName>NuGet.Build.Tasks.Pack</AssemblyName>
75+
<RootNamespace>$(AssemblyName)</RootNamespace>
76+
diff --git a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj
77+
index 930c76c2b..1f005b8d6 100644
78+
--- a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj
79+
+++ b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj
80+
@@ -3,7 +3,6 @@
81+
82+
<PropertyGroup>
83+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
84+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
85+
<TargetFramework/>
86+
<Shipping>true</Shipping>
87+
<IncludeInVSIX>true</IncludeInVSIX>
88+
diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
89+
index d4c24c328..aec028cda 100644
90+
--- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
91+
+++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
92+
@@ -4,7 +4,6 @@
93+
<PropertyGroup>
94+
<Description>NuGet wrapper for dotnet.exe</Description>
95+
<TargetFrameworks>netcoreapp1.0;net46</TargetFrameworks>
96+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netcoreapp1.0</TargetFrameworks>
97+
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net46' ">win7-x86</RuntimeIdentifier>
98+
<NoWarn>$(NoWarn);CS1591</NoWarn>
99+
<OutputType>Exe</OutputType>
100+
diff --git a/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj b/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj
101+
index ea84ac4a6..7ae9a3a18 100644
102+
--- a/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj
103+
+++ b/src/NuGet.Core/NuGet.Commands/NuGet.Commands.csproj
104+
@@ -4,7 +4,6 @@
105+
<PropertyGroup>
106+
<Description>Complete commands common to command-line and GUI NuGet clients</Description>
107+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
108+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
109+
<TargetFramework />
110+
<NoWarn>$(NoWarn);CS1591;CS1574;CS1573;CS1584;CS1658</NoWarn>
111+
<PackProject>true</PackProject>
112+
diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj
113+
index 83b6e2c7d..a59e91121 100644
114+
--- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj
115+
+++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj
116+
@@ -3,7 +3,6 @@
117+
118+
<PropertyGroup>
119+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
120+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
121+
<TargetFramework />
122+
<NoWarn>$(NoWarn);CS1591;CS1574</NoWarn>
123+
<PackProject>true</PackProject>
124+
diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
125+
index 1771bf6e6..3acb11f53 100644
126+
--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
127+
+++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj
128+
@@ -5,7 +5,6 @@
129+
<Description>NuGet's client configuration settings implementation.</Description>
130+
<NoWarn>$(NoWarn);CS1591</NoWarn>
131+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
132+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
133+
<TargetFramework />
134+
<PackProject>true</PackProject>
135+
<Shipping>true</Shipping>
136+
diff --git a/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj b/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj
137+
index b6ee4551e..2b2dc288c 100644
138+
--- a/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj
139+
+++ b/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj
140+
@@ -3,7 +3,6 @@
141+
142+
<PropertyGroup>
143+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
144+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
145+
<TargetFramework />
146+
<NoWarn>$(NoWarn);CS1591;CS1574</NoWarn>
147+
<PackProject>true</PackProject>
148+
diff --git a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
149+
index 7bae6915c..2dd1d0699 100644
150+
--- a/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
151+
+++ b/src/NuGet.Core/NuGet.Frameworks/NuGet.Frameworks.csproj
152+
@@ -4,7 +4,6 @@
153+
<PropertyGroup>
154+
<Description>The understanding of target frameworks for NuGet.Packaging</Description>
155+
<TargetFrameworks>netstandard1.6;net46;net40</TargetFrameworks>
156+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
157+
<TargetFramework />
158+
<NoWarn>$(NoWarn);CS1591;CS1574;CS1573</NoWarn>
159+
<LangVersion>5</LangVersion>
160+
diff --git a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj
161+
index 3f37b015d..97a613aaf 100644
162+
--- a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj
163+
+++ b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj
164+
@@ -3,7 +3,6 @@
165+
166+
<PropertyGroup>
167+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
168+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
169+
<TargetFramework />
170+
<NoWarn>$(NoWarn);CS1591</NoWarn>
171+
<PackProject>true</PackProject>
172+
diff --git a/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj b/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj
173+
index aa625dd14..4d2981e93 100644
174+
--- a/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj
175+
+++ b/src/NuGet.Core/NuGet.Packaging.Core/NuGet.Packaging.Core.csproj
176+
@@ -4,7 +4,6 @@
177+
<PropertyGroup>
178+
<Description>The core data structures for NuGet.Packaging</Description>
179+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
180+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
181+
<TargetFramework />
182+
<NoWarn>$(NoWarn);CS1591</NoWarn>
183+
<PackProject>true</PackProject>
184+
diff --git a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj
185+
index dcbf1ad24..149e1c7e5 100644
186+
--- a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj
187+
+++ b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj
188+
@@ -4,7 +4,6 @@
189+
<PropertyGroup>
190+
<Description>NuGet's implementation for reading nupkg package and nuspec package specification files.</Description>
191+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
192+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
193+
<TargetFramework />
194+
<NoWarn>$(NoWarn);CS1591;CS1574;CS1573;CS1572</NoWarn>
195+
<PackProject>true</PackProject>
196+
@@ -83,4 +82,4 @@
197+
</ItemGroup>
198+
199+
<Import Project="$(BuildCommonDirectory)common.targets" />
200+
-</Project>
201+
\ No newline at end of file
202+
+</Project>
203+
diff --git a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
204+
index a731b35e1..0d8d59bf3 100644
205+
--- a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
206+
+++ b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
207+
@@ -3,7 +3,6 @@
208+
209+
<PropertyGroup>
210+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
211+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
212+
<TargetFramework />
213+
<NoWarn>$(NoWarn);CS1591;CS1573</NoWarn>
214+
<PackProject>true</PackProject>
215+
diff --git a/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj b/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj
216+
index 209895edd..b54cf27a3 100644
217+
--- a/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj
218+
+++ b/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj
219+
@@ -3,7 +3,6 @@
220+
221+
<PropertyGroup>
222+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
223+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
224+
<TargetFramework />
225+
<NoWarn>$(NoWarn);CS1591;CS1573;CS0012</NoWarn>
226+
<PackageTags>nuget protocol</PackageTags>
227+
diff --git a/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj b/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj
228+
index a05b2f1b3..c3192d93a 100644
229+
--- a/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj
230+
+++ b/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj
231+
@@ -4,7 +4,6 @@
232+
<PropertyGroup>
233+
<Description>NuGet's dependency resolver within the NuGet.Packaging package</Description>
234+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
235+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
236+
<TargetFramework />
237+
<NoWarn>$(NoWarn);CS1591;CS1573</NoWarn>
238+
<PackProject>true</PackProject>
239+
diff --git a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj
240+
index f55224948..4954e4a3f 100644
241+
--- a/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj
242+
+++ b/src/NuGet.Core/NuGet.Versioning/NuGet.Versioning.csproj
243+
@@ -3,7 +3,6 @@
244+
245+
<PropertyGroup>
246+
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
247+
- <TargetFrameworks Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">netstandard1.6</TargetFrameworks>
248+
<TargetFramework />
249+
<Description>NuGet's implementation of Semantic Versioning.</Description>
250+
<PackageTags>semver;semantic versioning</PackageTags>
251+
--
252+
2.14.1
253+

‎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>20180509-04</OfficialBuildId>
9+
<OfficialBuildId>20180606-03</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>20180509-03</OfficialBuildId>
13+
<OfficialBuildId>20180606-02</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>20180509-03</OfficialBuildId>
10+
<OfficialBuildId>20180606-05</OfficialBuildId>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

‎repos/nuget-client.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
<ItemGroup>
1919
<EnvironmentVariables Include="MS_PFX_PATH=$(NuGetKeyFilePath)" />
20+
<EnvironmentVariables Include="NUGET_PFX_PATH=$(NuGetKeyFilePath)" />
2021
<RepositoryReference Include="newtonsoft-json" />
2122
<RepositoryReference Include="common" />
2223
</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>20180427.7</OfficialBuildId>
5+
<OfficialBuildId>20180606.1</OfficialBuildId>
66
<OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
77
<BuildCommandArgs>--pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommandArgs>
88

‎src/cli

‎src/core-setup

‎src/coreclr

0 commit comments

Comments
 (0)