Commit graph

36 commits

Author SHA1 Message Date
Daniel Plaisted
3555f34527 Move old infrastructure to subfolder 2018-10-21 20:47:58 -07:00
Daniel Plaisted
7f841e0bc6 Update version numbers to 3.0, fix branch info 2018-07-11 18:28:19 -07:00
Livar Cunha
e2b679c4bb Merge branch 'master' of /Users/livarcocc/Documents/git/cli into merge_master_cli
* 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits)
  Updating signing project to use new intermediate directory (int).
  Update runtimeconfig.json doc for 2.1 (#9382)
  Shortening the path to the intermediate folder by renaming it to int.
  fix typo (#9364)
  Updating asp.net to 2.2.0 as well.
  Updating the build and tests to work with the 2.2.0 runtime.
  Simplified combining dictionaries in Telemetry
  Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362)
  Fix extraction of folders (#9335)
  Update Sha256Hasher.cs
  Fix relative path tool path (#9330)
  Insert updated SDK from 2.1.4xx branch
  MSBuild 15.8.60
  Fix crash when user home directory cannot be determined.
  Make `CliFolderPathCalculator` a static class.
  Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
  Add retry when Directory.Move (#9313)
  Override new SdkResult public properties
  Add reference to Microsoft.Build.NuGetSdkResolver
  Disable crossgen for MSBuild inline-task refs
  ...
2018-06-25 22:38:01 -07:00
Livar
447bd91100
Merge branch 'master' into merges/release/2.1.4xx-to-master 2018-06-04 11:38:31 -07:00
John Beisner
468116f9f2
Merge pull request #9331 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-24 09:30:28 -07:00
Livar Cunha
6dfa6af7d6 Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true. 2018-05-22 10:45:11 -07:00
John Beisner
508f902ed0
Merge pull request #9296 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-16 14:52:29 -07:00
John Beisner
b78d591c97
Merge pull request #9284 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-16 09:04:53 -07:00
Matt Mitchell
1aae04f316 Accept DropSuffix as a boolean 2018-05-14 13:43:09 -07:00
Livar
69062dda4e
Merge pull request #9266 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-14 09:47:53 -07:00
Livar
11f2843f7b
Merge pull request #9252 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-11 10:16:04 -07:00
Livar Cunha
e60d0a79e5 Making the CLI package name be only major.minor version and updating the version of the runtime packages that we depend on. 2018-05-08 18:10:17 -07:00
Livar
d65b6b0d06
Update version to rtm 2018-04-30 12:00:51 -07:00
Livar
3070750a5b
Updating CLI branding to RC1 2018-04-19 12:46:56 -07:00
Livar
373f189ad2 Updating branding to 2.1.4xx 2018-04-17 16:38:01 -07:00
Livar Cunha
1e2c8bed24 Update the branding of the SDK to 2.2.100-preview1. 2018-04-16 12:04:00 -07:00
Livar Cunha
d26719d8de Modifying branding.props to no longer have the version there manually updated. With this last change, updating the CLI version should require changes only in the Version.props file. 2018-04-04 21:21:10 -07:00
Livar Cunha
c5e58ee5f4 Updating the CLI branding to 2.1.300-preview3. 2018-03-19 09:50:31 -07:00
Livar Cunha
df2bbb81b2 Updating the branding to 2.1.3-preview2. 2018-01-22 13:32:51 -08:00
Livar
13ba5efc12 Updating the version on master to 2.2.0 2017-10-17 16:53:50 -07:00
Livar
e9b0eefbd9 Update the version suffix to refac 2017-10-12 20:17:06 -07:00
Nick Guerrera
f97742aa43 Change pre-release label for infrastructure work 2017-10-03 14:52:13 -07:00
John Beisner
7b3c1bbb23 Adding consistent "Project" headers to inported props and target files.
(cherry picked from commit 74ad01b576)
2017-09-27 16:54:39 -07:00
Livar Cunha
84c56a8a92 Updating the CLI branding to 2.0.3 2017-09-26 15:39:02 -07:00
John Beisner
74ad01b576 Adding consistent "Project" headers to inported props and target files. 2017-09-05 14:44:25 -07:00
Daniel Plaisted
dc88bac18f Update version to 2.0.2-vspre 2017-08-16 14:22:25 -07:00
William Li
1ed6be56ca Updating the branding to 2.0.1-servicing 2017-08-07 15:45:35 -07:00
Livar
1728aef325 Merge branch 'master' into merges/release/2.0.0-to-master-20170718-070024 2017-07-18 15:58:34 -07:00
John Beisner
97f527d661 If "ReleaseSuffix" is already set, honor that value. 2017-07-17 10:31:25 -07:00
Livar
9f0584f449 Updating the branding for 2.0 to preview3 2017-06-15 11:42:06 -07:00
Livar Cunha
33b91ad316 Updating the branding to match 2.1.0-preview1. 2017-05-24 09:02:17 -07:00
Livar Cunha
3c5a7542e0 Updating the branding of the CLI in master to preview3 for now, so that it does not conflict with the release/2.0.0 CLI. 2017-05-24 00:15:55 -07:00
Livar Cunha
6df9bc3055 Moving master branch to preview2 branding. 2017-04-21 14:26:45 -07:00
Unknown
d313cb4012 Change suffix to preview1 2017-03-07 12:05:42 -08:00
Piotr Puszkiewicz
0f919d7442 fix merge 2017-02-17 13:07:14 -08:00
Justin Goshi
62abef428e Rename build files 2017-02-14 15:42:13 -08:00
Renamed from build/Microsoft.DotNet.Cli.Version.props (Browse further)