Skip to content

[ArPow] Add installer repo to tarball#11483

Merged
MichaelSimons merged 2 commits intodotnet:mainfrom
MichaelSimons:issue-2284
Aug 19, 2021
Merged

[ArPow] Add installer repo to tarball#11483
MichaelSimons merged 2 commits intodotnet:mainfrom
MichaelSimons:issue-2284

Conversation

@MichaelSimons
Copy link
Member

@MichaelSimons MichaelSimons commented Aug 11, 2021

@MichaelSimons MichaelSimons force-pushed the issue-2284 branch 7 times, most recently from cbfed38 to 8a3a487 Compare August 19, 2021 00:32
<PropertyGroup>
<MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
<MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net5.0</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
<MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' != 'true' ">net5.0</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
Copy link
Member Author

Choose a reason for hiding this comment

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

This line as well as the offline check in the next property can be removed once installer pulls in a newer arcade.


<PropertyGroup>
<CoreSetupRootUrl>$(CoreSetupBlobRootUrl)Runtime/</CoreSetupRootUrl>
<CoreSetupRootUrl Condition=" '$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' == 'true' ">$(CoreSetupBlobRootUrl)</CoreSetupRootUrl>
Copy link
Member Author

Choose a reason for hiding this comment

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

The AND '$(DotNetBuildOffline)' == 'true' can be removed from this file once the two patches included in the PR are migrated back to the repos and picked up by installer.

Copy link

Choose a reason for hiding this comment

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

Did we file an issue for this?

@MichaelSimons MichaelSimons marked this pull request as ready for review August 19, 2021 02:55
@MichaelSimons MichaelSimons requested a review from a team as a code owner August 19, 2021 02:55

<PropertyGroup>
<CoreSetupRootUrl>$(CoreSetupBlobRootUrl)Runtime/</CoreSetupRootUrl>
<CoreSetupRootUrl Condition=" '$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' == 'true' ">$(CoreSetupBlobRootUrl)</CoreSetupRootUrl>
Copy link

Choose a reason for hiding this comment

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

Did we file an issue for this?

@MichaelSimons MichaelSimons merged commit f2576ec into dotnet:main Aug 19, 2021
@MichaelSimons MichaelSimons deleted the issue-2284 branch August 19, 2021 15:11
crummel pushed a commit to crummel/dotnet_core-sdk that referenced this pull request Aug 20, 2021
MichaelSimons added a commit that referenced this pull request Aug 23, 2021
* [ArPow] Add runtime repo to tarball (#11506)

* Add runtime repo / update runtime project

* Update runtime-portable logs and properties

* Create runtime-portable git-info

* Fix unpack of IntermediatePackages

* Re-enable references to runtime

* Pass TargetRid and NonPortable to runtime build

* Only build allconfigurations in non-portable build

* Add SDK patch to disable new CA warning

* Increase built tarball timeout

* Update prebuilt version

* [ArPow] Add installer repo to tarball (#11483)

* Ignore  failure in no-network case

Co-authored-by: Dan Seefeldt <dseefeld@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Matt Galbraith <mattgal@microsoft.com>
crummel added a commit that referenced this pull request Aug 24, 2021
* [main] Update dependencies from dotnet/sdk (#11565)

[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/sdk build 20210817.21 (#11569)

[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.0.0-preview-20210817-01 to 17.0.0-preview-20210817-02 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/arcade build 20210817.1 (#11570)

[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21309-01 to 1.1.0-beta-21416-05 (parent: Microsoft.DotNet.Arcade.Sdk)
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21412.1 to 1.0.0-beta.21414.1 (parent: Microsoft.DotNet.Arcade.Sdk)

* [ArPow] Add runtime repo to tarball (#11506)

* Add runtime repo / update runtime project

* Update runtime-portable logs and properties

* Create runtime-portable git-info

* Fix unpack of IntermediatePackages

* Re-enable references to runtime

* Pass TargetRid and NonPortable to runtime build

* Only build allconfigurations in non-portable build

* Add SDK patch to disable new CA warning

* Increase built tarball timeout

* Update prebuilt version

* Remove 5.0.3xx and preview 7
Add rc1, 6.0 daily, and move main to 7.0

* Removing 7.0 for now as there aren't builds yet.

* Update dependencies from https://github.com/dotnet/arcade build 20210818.12 (#11594)

[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21416-05 to 1.1.0-beta-21417-01 (parent: Microsoft.DotNet.Arcade.Sdk)
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21414.1 to 1.0.0-beta.21417.1 (parent: Microsoft.DotNet.Arcade.Sdk)

* [ArPow] Add installer repo to tarball (#11483)

* Fix the rc2 aka.ms links

* Add NuGet

* Make safe repo name safer.

* some more props filename stuff

* Patches to get the repo to build

* Use NuGet build script instead of manually calling msbuild.

* Add patch for source-build in build.sh in nuget.

* Use existing 5.0 nuget patch.

* Fixes for build scripts and .NET 6 SDK upgrade.

* Remove obsolete patch - this was caused by not using the correct source-build SDK.

* Address code review comment for source-build build script.

* Restore reference from installer to NuGet.

* Fix patch not applying.

* Don't try to pass Arcade build args to MSBuild.

* Fix script typo.

* Patch NuGet.Frameworks to produce netstandard2.0 for VSTest.

* Did this patch the wrong way around.

* Ignore  failure in no-network case

* UPdate prebuilts version.

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Dan Seefeldt <dseefeld@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Matt Galbraith <mattgal@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[ArPow Tarball] Tier 5 - Add installer repo to arpow tarball

3 participants