mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16747 commits 41 branches 190 tags 95 MiB
Commit graph

3618 commits

Author SHA1 Message Date
Nick Guerrera
175ab37f20 Merge branch 'release/5.0.1xx-preview1' into merge-50p1 2020-02-28 14:27:38 -08:00
William Li
d46ee00032
Add 5.0 template (#6583) 
* Add 5.0 templates to template/5.0 folder
 2020-02-27 13:25:10 -08:00
Sarah Oslund
22192f3d37
Merge pull request #6558 from sfoslund/UpdateBranding 
Updating installer branding
 2020-02-27 12:49:22 -08:00
sfoslund
c5a1a3c006 Updating installation note with proper versions 2020-02-27 11:13:56 -08:00
Michael Simons
ef4011b55a
Update BranchInfo channel for release/5.0.1xx-preview1 branch (#6574) 2020-02-26 08:18:05 -08:00
Phil Henning
7ddc5746f3 Add 5.0 common project templates to Bundle. 2020-02-25 07:00:13 -08:00
sfoslund
c169c1c426 Updating installer branding 2020-02-24 15:34:30 -08: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
Daniel Plaisted
2a8f6d1b34 Update 2.1 implicit versions 2020-02-19 11:00:34 -08:00
Fadi Hanna
645fdc4bc6
Fix formatting bug for crossgen2's supported RIDs (#6302) 2020-02-06 13:01:19 -08:00
William Li
288bb5c8b6 Remove all reference to 21 template 2020-02-05 22:16:55 -08:00
William Godbe
6dc2944d31
Revert to 3.1.1 runtime (#6272) 
* Revert to 3.1.1 runtime

* use 3.1.1 version of GenerateLayout.targets
 2020-02-03 10:46:25 -08:00
Fadi Hanna
63e9316a15
Add a KnownCrossgen2Pack entry for the crossgen2 compiler packages (#6227) 2020-01-30 16:16:07 -08:00
msftbot[bot]
2f3fb6ea5e
Merge pull request #6242 from wli3/fix-msi-gg 
Fix msi non-deterministic ComponentId
 2020-01-28 21:07:00 +00: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
sfoslund
46b8ddf0b5 Reverting drop suffix change 2020-01-21 11:24:22 -08:00
Sarah Oslund
672d0ec1e2 Merge branch 'release/3.1.1xx' into Merging3.1And3.2 2020-01-21 08:40:01 -08:00
William Li
252416a21a Remove -gg in harvest 2020-01-19 08:53:28 -08:00
dotnet-maestro[bot]
56ce343ea2
[release/3.1.1xx] Update dependencies from dotnet/aspnetcore (#6162) 
* Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.1

- dotnet-user-secrets - 3.1.2-servicing.20066.1
- dotnet-watch - 3.1.2-servicing.20066.1
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20066.1
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.1

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.4

- dotnet-user-secrets - 3.1.2-servicing.20066.4
- dotnet-watch - 3.1.2-servicing.20066.4
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20066.4
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.4

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.14

- dotnet-user-secrets - 3.1.2-servicing.20066.14
- dotnet-watch - 3.1.2-servicing.20066.14
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20066.14
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.14

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200116.15

- dotnet-user-secrets - 3.1.2-servicing.20066.15
- dotnet-watch - 3.1.2-servicing.20066.15
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20066.15
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20066.15

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200117.1

- dotnet-user-secrets - 3.1.2-servicing.20067.1
- dotnet-watch - 3.1.2-servicing.20067.1
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20067.1
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20067.1

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200117.4

- dotnet-user-secrets - 3.1.2-servicing.20067.4
- dotnet-watch - 3.1.2-servicing.20067.4
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- dotnet-dev-certs - 3.1.2-servicing.20067.4
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20067.4

* Update dependencies from https://github.com/dotnet/aspnetcore build 20200118.1

- dotnet-dev-certs - 3.1.2-servicing.20068.1
- dotnet-user-secrets - 3.1.2-servicing.20068.1
- dotnet-watch - 3.1.2-servicing.20068.1
- Microsoft.AspNetCore.App.Ref - 3.1.2
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.1.2-servicing.20068.1

* Update AspNetCoreTargetingPackBlobVersion to 3.1.2

* fixup AspNetCoreTargetingPackBlobVersion

* Use property

* don't use property

Co-authored-by: William Godbe <wigodbe@microsoft.com>
 2020-01-18 21:31:47 +00:00
Sarah Oslund
cb71d005c1 Merge branch 'release/3.1.1xx' into release/3.1.2xx 2020-01-15 09:42:07 -08:00
Sarah Oslund
0a4f5e443d Merge branch 'release/3.1.2xx' 2020-01-15 09:23:07 -08:00
Daniel Plaisted
8131a95fc2 Bump branding to 3.1.102 2020-01-14 19:34:03 -08:00
Nick Guerrera
8d13410014 Bump 2.1.x implicit versions 
Disable SDK tests that do 2.1.x self-contained

Delete GivenSelfContainedAppsRollForward. It doesn't work with 3.x+ already and won't work with 2.x MSRCs.
 2020-01-14 17:45:28 -08:00
Livar Cunha
688644d44e Did a hack where we are writing the version to a file during build to be read during publish, as these are two separate builds by arcade and also passed the BuildNumberId so that the id is calculated properly during copy to latest. 2020-01-09 21:13:46 -08:00
Livar Cunha
befcc966a5 Moving the GitCommitHash code to a target to be shared amongst a couple of other targets. 2020-01-09 12:52:53 -08:00
Livar Cunha
ca6e86d472 Move GenerateFullNuGetVersion to a different target to be shared by build, publish and publish to latest. 2020-01-09 11:31:14 -08:00
William Li
2253434a97
Merge pull request #5931 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'
 2020-01-08 15:05:45 -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
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
dotnet-bot
b377529961 Merge in 'release/3.1.1xx' changes 2019-12-19 21:58:17 +00:00
Nick Guerrera
7d2bade6ec
Use suffixed location for 3.1.0 TP download (#5930) 
Use the suffixed location for the TP download.
Change back later.

Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
 2019-12-19 13:56:42 -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
Nick Guerrera
ac7c03ce2a Merged PR 4935: Bump 2.1.x and 3.0.x versions for SCD; use 3.1.0 for FDD 2019-12-17 01:05:32 +00:00
Matt Mitchell
a8cef816ed Stabilize package versions 2019-12-16 14:47:54 -08:00
Nick Guerrera
b925821a07 Bump to 3.0.2 for SCD; use 3.1.0 for SCD 2019-12-16 14:08:20 -08:00
DotNet Bot
e5837fa361 Merge pull request 4898 from darc-internal/release/3.1.1xx-1a8919d3-cda2-437b-9784-4b0111084702 into internal/release/3.1.1xx 2019-12-16 22:08:02 +00:00
Nick Guerrera
784091d577 Bump 2.1.x implicit versions 
Disable SDK tests that do 2.1.x self-contained

Delete GivenSelfContainedAppsRollForward. It doesn't work with 3.x+ already and won't work with 2.x MSRCs.
 2019-12-16 14:03:10 -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