Skip to content

Commit c6e4cef

Browse files
authored
Update SHAs for coreclr, corefx, core-setup and standard to pick up source-build fixes (#313)
* Move SHAs forward for core-setup and corefx to get source-build changes * Update other versions * Change core-setup to build with "BuildAllPackages" = true * Move SHAs forward for core-setup and corefx to get source-build changes * Update other versions * Change core-setup to build with "BuildAllPackages" = true * Update cli SHA to more recent SHA to get new version of Microsoft.Build.Runtime to fix sporadic issue with CI where a broken version of Microsoft.Build.Runtime.15.4.8 was being installed from the msbuild myget feed. Add cli-deps to NuGet.Config for cli update-dependencies. Add ExternalRestoreSource to repo build command for cli. * Update SHAs for corefx and core-setup to pickup fixes. Build corefx with BuildTest=false
1 parent 48763cf commit c6e4cef

10 files changed

+10
-9
lines changed

BuildToolsVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0-servicing-02221-03
1+
2.0.0-servicing-02312-03

NuGet.Config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<clear />
66
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
77
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
8+
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
89
</packageSources>
910
</configuration>

repos/cli.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<CLITargetsArgument Condition="'$(OS)' == 'Windows_NT'">'/p:CLITargets=\&quot;\&quot;\&quot;Prepare;Compile;Package\&quot;\&quot;\&quot;'</CLITargetsArgument>
66
<CLITargetsArgument Condition="'$(OS)' != 'Windows_NT'">'/p:CLITargets=&quot;Prepare;Compile;Package&quot;'</CLITargetsArgument>
7-
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(CLITargetsArgument) /v:detailed /p:SkipBuildingInstallers=true /p:IncludeNuGetPackageArchive=false /p:IncludeAdditionalSharedFrameworks=false /flp:v=detailed /p:CoreSetupBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot) /p:UsePortableLinuxSharedFramework=false /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false /p:IncludeAspNetCoreRuntime=false /p:IncludeMSBuildSdkResolver=false</BuildCommand>
7+
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(CLITargetsArgument) /v:detailed /p:SkipBuildingInstallers=true /p:IncludeNuGetPackageArchive=false /p:IncludeAdditionalSharedFrameworks=false /flp:v=detailed /p:CoreSetupBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot) /p:ExternalRestoreSources=$(SourceBuiltPackagesPath) /p:UsePortableLinuxSharedFramework=false /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false /p:IncludeAspNetCoreRuntime=false /p:IncludeMSBuildSdkResolver=false</BuildCommand>
88
<PackagesOutput>$(ProjectDirectory)artifacts/linux-x64/packages/</PackagesOutput>
99
<TarBallOutput>$(PackagesOutput)</TarBallOutput>
1010
<GitCommitCount>6908</GitCommitCount>

repos/core-setup.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<BuildArguments>-ConfigurationGroup=$(Configuration) -PortableBuild=false -SkipTests=true </BuildArguments>
66
<BuildArguments Condition="$(Platform.Contains('arm'))">$(BuildArguments) -TargetArchitecture=$(Platform) -DisableCrossgen=true -CrossBuild=true</BuildArguments>
7-
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false</BuildCommand>
7+
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false /p:BuildAllPackages=true</BuildCommand>
88
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
99
<LatestCommit>82b22fa44e46d624ebeddf156f33e9cfb317bd57</LatestCommit>
1010
<VersionSeedDate>2017-07-20</VersionSeedDate>

repos/corefx.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-
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) -$(Configuration) -buildArch=$(Platform) -portable=false -- /p:ILLinkTrimAssembly=false</BuildCommand>
5+
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) -$(Configuration) -buildArch=$(Platform) -portable=false -BuildTests=false -- /p:ILLinkTrimAssembly=false </BuildCommand>
66
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
77
<FrameworkBuildCommand>$(ProjectDirectory)/build$(ShellExtension) -$(Configuration) -buildArch=$(Platform) -Framework=netfx -OSGroup=Windows_NT -- /p:ILLinkTrimAssembly=false</FrameworkBuildCommand>
88
<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>

src/cli

Submodule cli updated 122 files

src/coreclr

Submodule coreclr updated 149 files

src/corefx

Submodule corefx updated 101 files

src/standard

0 commit comments

Comments
 (0)