Commit graph

322 commits

Author SHA1 Message Date
Livar Cunha
56c36dfd3a Fallback to commitcount for msi version when doing builds in CI or locally. For official builds it will use the patch number calculated by arcade. 2019-12-26 10:40:20 -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
Livar Cunha
57dd97f02a Adding back commit count for msi calculation. I believe we will need to change that to avoid colisions. 2019-12-20 15:58:08 -08:00
Livar Cunha
72f288ab58 Switching from using commit height for versioning to using Arcade's scheme. 2019-12-20 13:19:56 -08:00
William Li
d82cde6315 Fix merge 2019-12-17 21:37:59 -08:00
William Li
4e1ba631b8 Merge branch 'release/3.1.2xx' 2019-12-17 21:34:27 -08:00
mmitche
d78a7565b5 Merge remote-tracking branch 'upstream/release/3.1.1xx' into merge-from-311xx 2019-12-10 13:52:12 -08:00
Matt Mitchell
9060c20d14
Merge pull request #5830 from dotnet-maestro-bot/merge/release/3.1.1xx-to-release/3.1.2xx
[automated] Merge branch 'release/3.1.1xx' => 'release/3.1.2xx'
2019-12-10 08:32:37 -08:00
Matt Mitchell
e382ec542b
Fixup indentation 2019-12-09 08:11:52 -08:00
Matt Mitchell
40a92b5d67
Fixup version patch 2019-12-09 08:11:28 -08:00
Matt Mitchell
2b6bd1474e Merge remote-tracking branch 'upstream/release/3.0.1xx' into merge-from-release/3.0.1xx 2019-12-09 08:07:02 -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
William Godbe
a3c1db033e
Pin dependency on Core-Setup ref packs to 3.1.0 (#5814)
* Pin dependency on Core-Setup ref packs to 3.1.0

* Fixup core-setup feeds

* Move pinned deps later in file

* Update GenerateLayout to account for pinned packs
2019-12-06 14:56:33 -08:00
Nick Guerrera
41d020cd32 Merge branch 'master' into merge/release/3.1.2xx-to-master 2019-12-05 15:48:22 -08:00
William Li
5b489d6169
Update branching to "preview" 2019-12-05 11:14:53 -08:00
William Li
036e7afaff update branding 3.1.101 servicing 2019-11-22 13:29:45 -08:00
Matt Mitchell
7b0f60d871
[release/3.0.1xx] Update branding for 3.0.102 (#5725) 2019-11-22 11:25:16 -08:00
William Li
9018671d62
Set DropSuffix=false (#5737) 2019-11-21 11:22:15 -08:00
William Li
fc3c44a49c Update branding to 3.1.200 preview1 2019-11-21 10:23:59 -08:00
Nick Guerrera
4b50b4ac40 Bump 3.0 packs to 3.0.1 as appropriate (#5698) 2019-11-16 15:38:55 -08:00
William Godbe
9f6349b659
Update PreReleaseVersionLabel to RTM (#5671) 2019-11-15 12:50:53 -08:00
Daniel Plaisted
46cb5e7523 Stabilize package versions (#5587) 2019-11-13 11:49:49 -08:00
dotnet-maestro[bot]
a0c1b21f77 [release/3.1.1xx] Update dependencies from aspnet/AspNetCore (#5654)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20191112.9

- VS.Redist.Common.AspNetCore.TargetingPack.x64.3.1 - 3.1.0-preview3.19562.9
- dotnet-user-secrets - 3.1.0-preview3.19562.9
- dotnet-watch - 3.1.0-preview3.19562.9
- Microsoft.AspNetCore.App.Ref - 3.1.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.0
- dotnet-dev-certs - 3.1.0-preview3.19562.9

* Fix typo
2019-11-13 08:38:15 -08:00
William Li
bfc1b10150 Merge branch 'release/3.0.1xx' into release/3.1.1xx-release/3.0.1xx-11-11-2019 2019-11-11 12:33:48 -08:00
William Li
b6eeb93ece Revert "Remove rhel.6"
This reverts commit 58537a3b9f9d2bf77e85a5db7f07da38c72ce14f.
2019-11-11 10:55:07 -08:00
Matt Mitchell
bc5f8df0f5
Download from blob storage (#5586)
Do not use the CDN as this can cause caching issues if bits have to be overwritten (which should not happen automatically, but may happen manually in certain cases)
2019-11-08 14:24:42 -08:00
Matt Mitchell
36f2678880 Update implicit package versions for 2.2.7 and 2.1.14 (#5566) 2019-11-08 08:29:33 -08:00
Omair Majid
17b5d95d8b Enable building on arm64 machines (#4102)
With this commit, I can build core-sdk on RHEL 8 on arm64 directly,
without cross compilation.

Bump the sourcelink version to pick up the ability to parse git info
without depending on libgit2sharp. This allows sourcelink to work on
arm64. The version is the same as the one recently added to core-setup:
https://github.com/dotnet/core-setup/pull/7696

Introduce a new 'BuildArchitecture' msbuild property that contains the host
architecture (arm64, x64, etc). This is the architecture of the
currently running machine, and may be different from the architecture we
are targetting in the case of cross compilation.

There's a gotcha with BuildArchitecture: under Visual Studio (an x86) process,
we generally want a x64 architecture. So try and restrict it to arm64 only.

Use BuildArchitecture to determine whether _crossDir and LibCLRJitRid need to
be special-cased for arm64 or or not.
2019-11-07 10:33:59 -06:00
Matt Mitchell
c8f7bac971 Merge remote-tracking branch 'origin/merge-from-301xx' into merge-from-301xx 2019-11-07 07:43:43 -08:00
Matt Mitchell
960aafbd94 Merge remote-tracking branch 'upstream/release/3.0.1xx' into merge-from-301xx 2019-11-07 07:34:41 -08:00
Matt Mitchell
ebecffa82f Merge remote-tracking branch 'upstream/release/3.0.1xx' into merge-from-301xx 2019-11-07 07:33:47 -08:00
Matt Mitchell
ec736cbd54
Update implicit package versions for 2.2.7 and 2.1.14 (#5566) 2019-11-07 07:05:11 -08:00
Matt Mitchell
a79f31732b
Stabilize package versions (#5540) 2019-11-04 22:41:51 -08:00
dotnet-maestro[bot]
8b9de75a22 [release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#5526)
* Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.2

- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1

* Fix blob URLs for stabilized ASP.NET 3.0.x

Unpin 3.0.x ASP.NET targeting pack

Revert dotnet-* tools packages to 3.0.0 versions

* Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.7

- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1

* Fix version of the targeting pack

* Fix targeting pack version
2019-11-04 21:42:29 -08:00
Nick Guerrera
5f2669c394 Merge branch 'master' into merge/release/3.1.1xx-to-master 2019-11-04 15:38:12 -08:00
William Li
ced31b69bf Update dockers (#5186) (#5416)
- Remove ubuntu 14.04 and groovey file
- Remove all old fedora
- Update to Debian Stretch
- Remove rhel.6
	- No debian 9 1.x runtime support
2019-11-01 09:46:28 -07:00
Matt Mitchell
44a1686a40 Update branding for preview3 (#5443) 2019-10-31 17:11:55 -07:00
William Li
d660497f89
Update dockers (#5186)
- Remove ubuntu 14.04 and groovey file
- Remove all old fedora
- Update to Debian Stretch
- Remove rhel.6
	- No debian 9 1.x runtime support
2019-10-30 11:44:13 -07:00
halex2005
026695bb0c update nunit3 templates versions: (#5335)
- issued new v1.6.4 for .NET Core 3 with updated dependencies versions
- issued new v1.7.0 wih support for .NET Core 3.1 targeting, netcoreapp3.1 is the default targeting since that version
2019-10-30 11:03:30 -07:00
Nick Guerrera
4a0133f605
Merge pull request #5382 from dotnet/merges/release/3.0.1xx-to-release/3.1.1xx
Merge release/3.0.1xx to release/3.1.1xx
2019-10-29 12:56:35 -07:00
Livar
890dc4ba41
Update template versions for 2.1/2.2 to 2.1.14 and 2.2.8 (#5340)
* Update template versions for 2.1/2.2 to 2.1.14 and 2.2.8

* Update IDs of Microsoft.DotNet.Web.Spa.ProjectTemplates packages
2019-10-28 10:59:40 -07:00
Nick Guerrera
ed64463823 Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx 2019-10-25 14:20:58 -07:00
Nick Guerrera
a655115e46
Download shared runtime archive from correct blob location (#5308) 2019-10-25 13:54:21 -07:00
Nick Guerrera
bfb734dbe0 Fix typos 2019-10-23 10:12:46 -07:00
Nick Guerrera
aa4c43735b Fix typos 2019-10-23 08:38:23 -07:00
Nick Guerrera
8e291f3189 Merge branch 'master' into merges/release/3.1.1xx-to-master 2019-10-23 08:26:09 -07:00
Nick Guerrera
b6ae1fbadc
Merge pull request #5263 from dotnet/merges/release/3.0.1xx-to-release/3.1.1xx
Merge release/3.0.1xx to release/3.1.1xx
2019-10-23 07:40:48 -07:00
John Beisner
cc47d12b0c
Increase button width (#5295) 2019-10-22 18:06:25 -07:00
John Beisner
62fbd18113
Updating the VS warning (#5294)
* Updating the VS warning; removing the upgrade GUIDs
2019-10-22 18:06:13 -07:00
Nick Guerrera
5d6a2e61ba Fix bundled versions 2019-10-22 13:41:25 -07:00