Skip to content

Update SHAs for coreclr, corefx, core-setup and standard to pick up source-build fixes #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 8, 2018
Merged

Update SHAs for coreclr, corefx, core-setup and standard to pick up source-build fixes #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
04c602b
Move SHAs forward for core-setup and corefx to get source-build changes
dseefeld Jan 18, 2018
3ee25ef
Update other versions
dseefeld Jan 19, 2018
b9d749d
Change core-setup to build with "BuildAllPackages" = true
dseefeld Jan 20, 2018
416d444
Move SHAs forward for core-setup and corefx to get source-build changes
dseefeld Jan 18, 2018
a1b7126
Update other versions
dseefeld Jan 19, 2018
a1286e0
Change core-setup to build with "BuildAllPackages" = true
dseefeld Jan 20, 2018
d774da5
Merge branch 'updateCoreFxCoreSetupSHAs' of https://github.com/dseefe…
dseefeld Jan 24, 2018
d20e032
Update cli SHA to more recent SHA to get new version of Microsoft.Bui…
dseefeld Jan 29, 2018
c329f8c
Update SHAs for corefx and core-setup to pickup fixes. Build corefx …
dseefeld Feb 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BuildToolsVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0-servicing-02221-03
2.0.0-servicing-02312-03
1 change: 1 addition & 0 deletions NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
<clear />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
</packageSources>
</configuration>
2 changes: 1 addition & 1 deletion repos/cli.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<CLITargetsArgument Condition="'$(OS)' == 'Windows_NT'">'/p:CLITargets=\&quot;\&quot;\&quot;Prepare;Compile;Package\&quot;\&quot;\&quot;'</CLITargetsArgument>
<CLITargetsArgument Condition="'$(OS)' != 'Windows_NT'">'/p:CLITargets=&quot;Prepare;Compile;Package&quot;'</CLITargetsArgument>
<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>
<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>
<PackagesOutput>$(ProjectDirectory)artifacts/linux-x64/packages/</PackagesOutput>
<TarBallOutput>$(PackagesOutput)</TarBallOutput>
<GitCommitCount>6908</GitCommitCount>
Expand Down
2 changes: 1 addition & 1 deletion repos/core-setup.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<BuildArguments>-ConfigurationGroup=$(Configuration) -PortableBuild=false -SkipTests=true </BuildArguments>
<BuildArguments Condition="$(Platform.Contains('arm'))">$(BuildArguments) -TargetArchitecture=$(Platform) -DisableCrossgen=true -CrossBuild=true</BuildArguments>
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false</BuildCommand>
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false /p:BuildAllPackages=true</BuildCommand>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we need to pass BuildAllPackages=true? I wouldn't expect that to be necessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The CLI build in source-build failed because of 2 missing depencencies: Microsoft.Extensions.DependencyModel and Microsoft.DotNet.PlatformAbstractions. These are conditionally built based on this property.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We intentionally don't build these in servicing, similar to corefx, unless we have changes we want to ship. It has been a while since I've thought about this but it feels like we would have a lot more failures higher up based on not building all the packages.

I guess for now this should work. For reference the corefx issue I filed a while back is #210.

<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
<LatestCommit>82b22fa44e46d624ebeddf156f33e9cfb317bd57</LatestCommit>
<VersionSeedDate>2017-07-20</VersionSeedDate>
Expand Down
2 changes: 1 addition & 1 deletion repos/corefx.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
<PropertyGroup>
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) -$(Configuration) -buildArch=$(Platform) -portable=false -- /p:ILLinkTrimAssembly=false</BuildCommand>
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) -$(Configuration) -buildArch=$(Platform) -portable=false -BuildTests=false -- /p:ILLinkTrimAssembly=false </BuildCommand>
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
<FrameworkBuildCommand>$(ProjectDirectory)/build$(ShellExtension) -$(Configuration) -buildArch=$(Platform) -Framework=netfx -OSGroup=Windows_NT -- /p:ILLinkTrimAssembly=false</FrameworkBuildCommand>
<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
Expand Down
2 changes: 1 addition & 1 deletion src/cli
Open in desktop
Submodule cli updated 122 files
2 changes: 1 addition & 1 deletion src/core-setup
Open in desktop
Submodule core-setup updated 23 files
+1 −1 BranchInfo.props
+1 −1 BuildToolsVersion.txt
+3 −3 build.proj
+4 −3 buildpipeline/Core-Setup-Windows-Arm-BT.json
+4 −3 buildpipeline/Core-Setup-Windows-BT.json
+7 −7 dependencies.props
+9 −8 dir.props
+70 −20 init-tools.sh
+6 −5 publish/dir.props
+7 −7 publish/dir.targets
+9 −9 publish/publish.proj
+6 −12 run.sh
+4 −4 sign.proj
+7 −7 src/pkg/packaging/dir.proj
+5 −2 src/pkg/packaging/rpm/scripts/after_remove_host.sh
+1 −1 src/pkg/packaging/windows/GetWix.ps1
+1 −1 src/pkg/packaging/windows/package.props
+1 −2 src/pkg/packaging/windows/package.targets
+15 −9 src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props
+24 −6 src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props
+15 −5 tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj
+6 −0 tools-local/tasks/ProcessSharedFrameworkDeps.cs
+13 −4 tools-local/tasks/core-setup.tasks.csproj
2 changes: 1 addition & 1 deletion src/coreclr
Open in desktop
Submodule coreclr updated 149 files
2 changes: 1 addition & 1 deletion src/corefx
Open in desktop
Submodule corefx updated 101 files
2 changes: 1 addition & 1 deletion src/standard
Open in desktop
Submodule standard updated 0 files