Commit graph

65 commits

Author SHA1 Message Date
Djuradj Kurepa
87a7258c1f Merge pull request #12604 from dkurepa/ResolveComponentGovernance
Resolve Component Governance alerts
2022-03-02 17:29:14 -08:00
Matt Mitchell
9994b20baa
Changes for internal runtime build support for .NET 6 (#11422)
- Cherry pick the internal runtime download changes over
- Cherry pick changes to the arcade SB template over (making the next update a noop and unblocking P7+)
- Hoist out the variable groups and parameters needed for the internal download to the top level yaml file.
- Remove the old DownloadFile task and replace this with the Arcade version. Specifically this allows us to remove
  set/use of the DOTNETCLIMSRC_READ_SAS_TOKEN environment variable and instead rely on that task's ability to decode and
  use a base64 encoded SAS token. The reason for the environment variable usage before was that the
  non-encoded SAS token was getting mangled by msbuild/bash/etc. on non-Windows OSs.
- Update the source build tarball template with support for internal runtimes

Update to source build template
2021-08-06 13:54:33 -07:00
dotnet-maestro[bot]
130a6b657a
[main] Update dependencies from dotnet/arcade (#11416)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21378.1 to 1.0.0-beta.21380.1 (parent: Microsoft.DotNet.Arcade.Sdk)

 - Disable implicit namespaces
2021-08-06 20:18:02 +00:00
Marc Paine
238e293a44 Update our version of newtonsoft.json.dll to latest. 2021-07-30 15:56:26 -07:00
Pranav K
97675dbc5a
Modify GenerateLayout to work with runtime configs that contain more than one runtime (#10901) 2021-06-17 09:36:05 -07:00
Manish Godse
959245b50a CR feedback 2021-06-13 17:47:24 -07:00
Manish Godse
bc6490c598 fix musl built on alpine 2021-06-12 01:55:58 -07:00
Manish Godse
38a2c60199 Fix cross builds. 2021-06-11 22:54:54 -07:00
Manish Godse
ed9c92df3a propagate targetArch to crossgen2 2021-06-11 21:25:25 -07:00
Manish Godse
88b8fc6b33 replace crossgen with crossgen2
crossgen is now defunct. This is validated on windows x64. More work will be required to get it to work across OS/arch.
2021-06-11 21:11:16 -07:00
Matt Mitchell
e58843bebc
Remove Copy Blobs To Latest functionality and clean up some publishing (#10773)
- The stage has been subsumed by the aka.ms functionality and now can be removed.
- Clean up dead properties and functionality no longer needed because of it.
- Removing publishing of nupkg files as blobs. This used to be useful before because we often needed to get at the nupkgs in a flat, easy to copy format for pushing to the VS feed. But now the staging pipeline takes care of this, and moreover the use of post-build signing means that these files are not useful straight out of the build anyway. This should reduce publishing time and some post-build signing time.

Remove nupkg install in publishing.props
2021-05-26 15:13:19 -07:00
Josh Soref
3676a74548 spelling: parameters
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
16efdaacbb spelling: package
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
4a643533f3 spelling: occurred
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
Josh Soref
754334ccac spelling: crossgen
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-05-26 05:16:13 -04:00
dseefeld
33f1944c6a Use PVP for PlatformAbstractions and NuGet.Versioning 2021-05-04 10:49:42 -07:00
Jeremy Koritzinsky
9abd0606af Don't match warning/error text from package_tool in DotNetDebTool 2021-02-05 10:25:08 -08:00
Jeremy Koritzinsky
056c3db077
Use the package_tool.sh script that dotnet-deb-tool wraps directly and is maintained in Arcade instead of the old dotnet-deb-tool CLI tool package. 2021-02-04 14:46:38 -08:00
Daniel Plaisted
7d2413d106 Merge release/5.0.2xx into master 2020-12-10 03:03:23 -08:00
Daniel Plaisted
096e69de3a Generate NETCoreSdkRuntimeIdentifierChain.txt in SDK folder 2020-11-20 00:42:41 -08:00
dotnet-maestro[bot]
f8eb583d40
[master] Update dependencies from dotnet/arcade (#8726)
* Update dependencies from https://github.com/dotnet/arcade build 20200924.4

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 5.0.0-beta.20474.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 5.0.0-rc.2.20474.5 -> To Version 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/arcade build 20200928.3

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 5.0.0-beta.20478.3

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 5.0.0-rc.2.20474.5 -> To Version 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/arcade build 20201006.7

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 5.0.0-beta.20506.7

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.SourceLink.GitHub,XliffTasks
 From Version 5.0.0-rc.2.20474.5 -> To Version 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/arcade build 20201009.12

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 6.0.0-beta.20509.12

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,Microsoft.WindowsDesktop.App,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0,dotnet-dev-certs,dotnet-user-secrets,dotnet-watch,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.SourceLink.GitHub,XliffTasks
 From Version 5.0.0-rc.2.20474.5 -> To Version 5.0.0-rc.1.20417.4 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/arcade build 20201020.8

Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 5.0.0-beta.20471.1 -> To Version 6.0.0-beta.20520.8

Dependency coherency updates

Microsoft.SourceLink.GitHub,XliffTasks
 From Version 1.1.0-beta-20464-02 -> To Version 1.1.0-beta-20519-02 (parent: Microsoft.DotNet.Arcade.Sdk

* Update FileInfoAssertions.cs

* Update FileInfoAssertions.cs

* Use tasks provided by Microsoft.DotNet.Build.Tasks.Installers when provided.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
2020-10-23 09:44:02 +02:00
Daniel Plaisted
6f30dca955 Fix build failures on platforms without an installer file extension 2020-10-21 08:59:51 -07:00
Daniel Plaisted
e505707598 Refactor template packaging logic to reduce duplication 2020-10-20 21:32:16 -07:00
Matt Mitchell
f56648180f
Use aspnetcore version suffix for template install directory (#8625)
This change is required for RTM stable builds. When stable versions are generated the CalculateTemplateVersions task will fail.

For .NET 3.x, installer is partially on arcade. It uses its own versioning model, but the arcade generated versions are actually set (specifically VersionSuffix). So even when stable builds are generated, VersionSuffix is available. It is unused when the aspnetcore template versions are stable.

For .NET 5, installer is now fully on arcade versioning, which means VersionSuffix is not set when stable versions are generated.

Instead of using installer's version suffix if aspnetcore's template versions are unstable, use the version suffix of the aspnetcore template versions. This subtley affects the installer directory of the templates:

If the aspnetcore version is: 5.0.0-rc.1.1234.5
And the installer version is: 5.0.100-rc.1.9999.9
Then:

Template install dir before this change: .dotnet\templates\5.0.0-rc.1.9999.9
Template install dir after this change: .dotnet\templates\5.0.0-rc.1.1234.5
Of note: The overall template layout doesn't make a ton of sense. The aspnetcore template version is used for the install directory, but many different templates are put in this directory, including some that have completely different versions.
2020-09-22 14:32:10 -07:00
Pranav K
45264fac2a
Stamp runtimeconfigs with M.AspNetCore.App versions
The installer currently updates all runtimeconfig files with the M.NETCore.App version
regardless of the runtime they are targeting. This causes issues with dotnet-watch
which is targeting the AspNetCore shared runtime as of 5.0-preview8. This change
updates the targets \ task to be more discerning.
2020-09-14 10:56:23 -07:00
Sarah Oslund
eeef3c72e8 PR feedback 2020-08-05 10:20:22 -07:00
Eric Erhardt
efe7c8e566
Remove references to PlatformAbstractions. (#7408)
* Remove references to PlatformAbstractions.

This will allow us to remove the PlatformAbstractions library from dotnet/runtime.

Contributes to https://github.com/dotnet/runtime/issues/3470
2020-05-06 09:59:23 -05:00
Matt Mitchell
f5e7d53b35
[release/5.0.1xx-preview3] Set up TLS 1.2 before calling dotnet-install for tests (#7068)
* Set TLS1.2 before running dotnet-install in tests
The new powershell process overrides the setting that build.ps1 sets up.

* Reduce logging verbosity
2020-04-08 13:07:50 -07:00
Daniel Plaisted
30b2fc31c2
Merge pull request #6993 from mmitche/generate-checksums-using-new-arcade-task
Generate checksums using new arcade task
2020-03-31 14:10:07 -07:00
Matt Mitchell
bbec23f976 Generate checksums using new arcade task 2020-03-26 15:18:36 -07:00
Sarah Oslund
5b24650ff9 Removing unused UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion property 2020-03-26 11:35:24 -07:00
Sarah Oslund
8cc89ea7e5 Adding automatic generation of DefaultRuntimeFrameworkVersions 2020-03-26 10:01:21 -07:00
Daniel Plaisted
8b76f8dc98
Merge pull request #6844 from brianrob/disable_partial_crossgen
Disable Partial Crossgen and Crossgen More Binaries
2020-03-23 13:55:33 -07:00
Brian Robbins
ab98cad0e2 Specify -MissingDependenciesOK to crossgen. 2020-03-17 13:48:18 -07:00
Brian Robbins
e87acd73ac Disable partial NGEN. 2020-03-11 17:38:41 -07:00
Nick Guerrera
c6b041e78c Fix merge issues with templates 2020-02-19 15:43:20 -08:00
Nick Guerrera
03963a5788 Merge branch 'release/5.0.1xx-preview1' into merge/release/3.1.2xx-to-master 2020-02-19 13:50:39 -08:00
William Li
90b13626ab Cap major 5 2020-01-28 12:33:43 -08:00
William Li
8b9a67d117 Finish ComponentID reset 2020-01-25 17:33:21 -08:00
William Li
38ff5b6af1 Use nuget version to better reduce code 2020-01-25 17:15:10 -08:00
William Li
0806ef1bd1 Use Task to calculate template versions
No behaivor change
2020-01-25 16:40:47 -08:00
Livar Cunha
83679698f9 Updated all MSIs to use the GenerateMsiVersion task and also moved the generation of FullNuGetVersion to a target because it depends on things happening in BeforeCommons.targets of Arcade. 2020-01-03 15:49:06 -08:00
Livar Cunha
34b644977c Use _PatchNumber from arcade instead of commit count. Fixes msi generation and changes VersionPatch to VersionFeature. 2019-12-23 15:18:07 -08:00
Divino César
624ec5e7b3 Augment DownloadFile task to make it able to download from public/private location (#5414)
* Patch to DownloadFile: retries + only use PrivateUri on 404 errors.

* Refactor PrivateURL in GenerateLayout.targets

* Address PR feedback.

* Addressing PR feedback.

* PR feedback

* PR feedback. Bug fix.

* Removing test related typo

* Fixup blob replacement

* Fixup blob replacement

* Broaden usage of read sas token to include PRs
2019-12-07 15:05:24 -08:00
Nick Guerrera
0f52aed34c Prepare for 3.0.1xx servicing
We were bumping targeting pack, framework-dependent default
runtime version, and self-contained default (latest) runtime
version in unison. This only works for previews where these
versions are all the same always. Now that we're servicing 3.0,
we:

1. Pin targeting packs to 3.0.0
2. Fix default framework-dependent runtime version at 3.0.0

This change also:

* Removes dependencies on legacy/internal netcoreapp packages. We
  now use Microsoft.NETCore.App.Internal version exclusively to
  calculate the blob storage path for core-setup.

* Uses PackageDownload for all templates, including
  latest. PackageReference had been used for latest only because
  it hid another bug with the netcoreapp reference of
  redist.csproj that is fixed here. That reference is now a
  FrameworkReference as it should be.

* Removes a bunch of shenanigans from
  GenerateBundledVersions.props that were causing issues with
  above. One casualty of that is that we hard code the RID lists
  for runtime pack, which I don't think is too bad, and actually
  will make it easier to merge in source build patches.

* Cleans up how runtime and targeting pack versions are
  referenced throughout, removing incorrect assumptions about
  them being the same.

* Incorporates a prior closed PR to use suffixed version for blob
  storage, even when assets coming from blob storage are
  stabilized. It needed changes to merge with this.

Note:

* A similar theoretical servicing issue exists for the versions
  of apphost, hostfxr, shared host, which are still assumed to be
  the same as the runtime version in several places. If we choose
  to service those independently, more work is required.

* There will be a 3.0.1 ASP.NET targeting pack, and so we will
  have to unpin that once it is ready. This change establishes
  the baseline of all targeting packs being pinnned, and they can
  be unpinned in the (hopefully rare) cases where they need to be
  serviced.
2019-10-03 22:57:58 -07:00
Livar Cunha
4083b9eda1 Updating GenerateMSBuildExtensionsSWR to match what we actually insert into VS. 2019-07-26 10:38:38 -07:00
Livar Cunha
3247485b57 Re-enable the generation of the msbuildextensions nupkg. 2019-07-12 15:05:32 -07:00
Dan Seefeldt
453414fc75 Consolidate MSBuild* versions for source-build (#2554) 2019-06-20 15:24:02 -07:00
Nick Guerrera
f688dc6920 Remove dependency on WindowsAzure.Storage in source build
The source code had already been conditioned out, but the conditional
PackageReference and DefineConstants got lost when this code moved to
core-sdk
2019-03-27 12:59:21 -07:00
John Beisner
131cc45593
Enabling the upgrade of the SDK bundle in a product-band (#530)
* Enabling the 'upgrade' of the SDK bundle in a 'product-band'.
2019-02-19 14:21:54 -08:00