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

16637 commits

This branch
This branch
All branches
Author SHA1 Message Date
dotnet-maestro[bot]
0216278652
Update dependencies from https://github.com/dotnet/arcade build 20200129.8 (#6261) 
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20079.8
 2020-01-30 13:35:10 +00:00
dotnet-maestro[bot]
b5630661fe
Update dependencies from https://github.com/dotnet/toolset build 20200130.1 (#6260) 
- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20080.1

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20080.1 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-30 11:42:49 +00:00
dotnet-maestro[bot]
1bce0e17ac
Update dependencies from https://github.com/dotnet/test-templates build 20200129.1 (#6259) 
- Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.20079.1
 2020-01-30 07:39:01 +00:00
dotnet-maestro[bot]
3546a6767b
[release/3.1.2xx] Update dependencies from dotnet/toolset (#6256) 
* Update dependencies from https://github.com/dotnet/toolset build 20200129.7

- Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20079.7

* Update dependencies from https://github.com/dotnet/toolset build 20200129.8

- Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20079.8
 2020-01-30 00:42:07 +00:00
dotnet-maestro[bot]
b9b553b713
[master] Update dependencies from dotnet/toolset (#6253) 
* Update dependencies from https://github.com/dotnet/toolset build 20200129.1

- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20079.1

* Update dependencies from https://github.com/dotnet/toolset build 20200129.2

- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20079.2

* Update dependencies from https://github.com/dotnet/toolset build 20200129.3

- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20079.3

* Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20079.3 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-29 22:56:34 +00:00
dotnet-maestro[bot]
62435b1900
[release/3.1.2xx] Update dependencies from dotnet/toolset (#6254) 
* Update dependencies from https://github.com/dotnet/toolset build 20200129.5

- Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20079.5

* Update dependencies from https://github.com/dotnet/toolset build 20200129.6

- Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20079.6
 2020-01-29 22:28:25 +00:00
dotnet-maestro[bot]
7d6455dc2c
Update dependencies from https://github.com/dotnet/toolset build 20200128.5 (#6249) 
- Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20078.5

Dependency coherency updates

- Microsoft.NET.Sdk - 3.1.200-preview.20072.3 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-29 21:50:10 +00:00
dotnet-maestro[bot]
65390c2fbf
Update dependencies from https://github.com/dotnet/toolset build 20200129.4 (#6252) 
- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20079.4

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20079.4 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-29 21:47:14 +00:00
dotnet-maestro[bot]
73737b15db
[master] Update dependencies from dotnet/toolset (#6250) 
* Update dependencies from https://github.com/dotnet/toolset build 20200128.6

- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20078.6

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 5.0.0-alpha1.20077.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20078.6 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20200128.7

- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20078.7

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 5.0.0-alpha1.20078.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20078.7 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20200128.9

- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20078.9

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 5.0.0-alpha1.20078.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20078.9 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20200128.8

- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20078.8

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 5.0.0-alpha1.20078.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20078.8 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-29 21:15:03 +00:00
William Li
53aa3fc63d
Merge pull request #6245 from wli3/fix-msi-gg-release/3.1.1xx 
Fix msi gg release/3.1.1xx
 2020-01-29 12:57:48 -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
3e8b475e2f Cap major 5 2020-01-28 12:35:25 -08:00
William Li
df09f07394 Finish ComponentID reset 2020-01-28 12:35:16 -08:00
William Li
fdda58e6ff Use nuget version to better reduce code 2020-01-28 12:35:09 -08:00
William Li
b76a641e4f Use Task to calculate template versions 
No behaivor change
 2020-01-28 12:35:01 -08:00
William Li
24ffef0659 Remove -gg in harvest 2020-01-28 12:34:51 -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
msftbot[bot]
29f4d693a9
Merge pull request #6235 from Logerfo/patch-1 
core-setup -> runtime
 2020-01-24 00:42:14 +00:00
dotnet-maestro[bot]
357ad71b28
[release/3.1.1xx] Update dependencies from dotnet/wcf (#6228) 
* Update dependencies from https://github.com/dotnet/wcf build 20200122.1

- System.ServiceModel.Primitives - 4.7.0-rtm.20072.1

* Reverting change in templating feed

Co-authored-by: Sarah Oslund <sfoslund@microsoft.com>
 2020-01-24 00:03:48 +00:00
dotnet-maestro[bot]
147128e365
[release/3.1.2xx] Update dependencies from dotnet/core-setup (#6231) 
* Update dependencies from https://github.com/dotnet/core-setup build 20200120.1

- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.App.Host.win-x64 - 3.1.2
- Microsoft.NETCore.App.Internal - 3.1.2-servicing.20070.1
- Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2
- Microsoft.NETCore.DotNetHostResolver - 3.1.2

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.1-servicing.20069.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 3.1.2-servicing.20069.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Add 3.1.2 template feed

Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
 2020-01-23 19:31:21 +00:00
dotnet-maestro[bot]
99ee04ad08
[master] Update dependencies from dotnet/runtime (#6221) 
* Update dependencies from https://github.com/dotnet/runtime build 20200121.7

- Microsoft.NETCore.App.Host.win-x64 - 5.0.0-alpha.1.20071.7
- Microsoft.NETCore.App.Internal - 5.0.0-alpha.1.20071.7
- Microsoft.NETCore.DotNetHostResolver - 5.0.0-alpha.1.20071.7
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha.1.20071.7
- Microsoft.NETCore.App.Ref - 5.0.0-alpha.1.20071.7

Dependency coherency updates

- Microsoft.NETCore.Platforms - 5.0.0-alpha.1.20071.7 (parent: Microsoft.NetCore.App.Internal)

* Update dependencies from https://github.com/dotnet/runtime build 20200122.3

- Microsoft.NETCore.App.Host.win-x64 - 5.0.0-alpha.1.20072.3
- Microsoft.NETCore.App.Internal - 5.0.0-alpha.1.20072.3
- Microsoft.NETCore.DotNetHostResolver - 5.0.0-alpha.1.20072.3
- Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-alpha.1.20072.3
- Microsoft.NETCore.App.Ref - 5.0.0-alpha.1.20072.3

Dependency coherency updates

- Microsoft.NETCore.Platforms - 5.0.0-alpha.1.20072.3 (parent: Microsoft.NetCore.App.Internal)
 2020-01-23 18:54:29 +00:00
dotnet-maestro[bot]
1a243b36f3
[master] Update dependencies from dotnet/windowsdesktop (#6239) 
* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200123.4

- Microsoft.WindowsDesktop.App - 5.0.0-alpha.1.20073.4
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-alpha.1.20073.4
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-alpha.1.20073.4

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha.1.20073.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200123.5

- Microsoft.WindowsDesktop.App - 5.0.0-alpha.1.20073.5
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-alpha.1.20073.5
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-alpha.1.20073.5

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha.1.20073.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
 2020-01-23 18:26:09 +00:00
dotnet-maestro[bot]
bafdca8cc2
Update dependencies from https://github.com/dotnet/windowsdesktop build 20200123.3 (#6238) 
- Microsoft.WindowsDesktop.App - 5.0.0-alpha.1.20073.3
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-alpha.1.20073.3
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-alpha.1.20073.3
 2020-01-23 16:35:34 +00:00
dotnet-maestro[bot]
d751f2a0bf
[master] Update dependencies from dotnet/toolset (#6237) 
* Update dependencies from https://github.com/dotnet/toolset build 20200123.2

- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20073.2

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20073.2 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20200123.3

- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20073.3

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20073.3 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-23 15:56:34 +00:00
dotnet-maestro[bot]
14d25c96a3
[master] Update dependencies from dotnet/windowsdesktop (#6232) 
* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200122.4

- Microsoft.WindowsDesktop.App - 5.0.0-alpha.1.20072.4
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-alpha.1.20072.4
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-alpha.1.20072.4

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-alpha1.20072.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha.1.20072.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200123.1

- Microsoft.WindowsDesktop.App - 5.0.0-alpha.1.20073.1
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-alpha.1.20073.1
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-alpha.1.20073.1

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-alpha1.20072.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha.1.20072.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

* Update dependencies from https://github.com/dotnet/windowsdesktop build 20200123.2

- Microsoft.WindowsDesktop.App - 5.0.0-alpha.1.20073.2
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-alpha.1.20073.2
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-alpha.1.20073.2

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-alpha1.20072.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha.1.20073.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
 2020-01-23 15:29:04 +00:00
dotnet-maestro[bot]
ff06de0a03
Update dependencies from https://github.com/dotnet/toolset build 20200123.1 (#6236) 
- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20073.1

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20073.1 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-23 15:20:53 +00:00
dotnet-maestro[bot]
07f26ac531
Update dependencies from https://github.com/dotnet/arcade build 20200122.3 (#6234) 
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20072.3
 2020-01-23 13:30:41 +00:00
Bruno Logerfo
8ba777f16c
core-setup -> runtime 2020-01-23 10:16:38 -03:00
dotnet-maestro[bot]
b4519e65a4
Update dependencies from https://github.com/dotnet/windowsdesktop build 20200122.3 (#6230) 
- Microsoft.WindowsDesktop.App - 5.0.0-alpha.1.20072.3
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-alpha.1.20072.3
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-alpha.1.20072.3

Dependency coherency updates

- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha.1.20072.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
 2020-01-23 03:10:34 +00:00
dotnet-maestro[bot]
e743e4d3a2
Update dependencies from https://github.com/dotnet/windowsdesktop build 20200122.2 (#6229) 
- Microsoft.WindowsDesktop.App - 5.0.0-alpha.1.20072.2
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-alpha.1.20072.2
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-alpha.1.20072.2

Dependency coherency updates

- Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-alpha1.20072.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-alpha.1.20072.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
 2020-01-23 00:00:33 +00:00
dotnet-maestro[bot]
ffee56fc7d
Update dependencies from https://github.com/dotnet/toolset build 20200122.5 (#6226) 
- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20072.5

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20072.5 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-22 19:25:35 +00:00
dotnet-maestro[bot]
38a1c438b7
[release/3.1.2xx] Update dependencies from dotnet/toolset (#6217) 
* Update dependencies from https://github.com/dotnet/toolset build 20200121.4

- Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20071.4

* Update dependencies from https://github.com/dotnet/toolset build 20200122.4

- Microsoft.Dotnet.Toolset.Internal - 3.1.200-preview.20072.4

* Reverting templating change in nuget.config

Co-authored-by: Sarah Oslund <sfoslund@microsoft.com>
 2020-01-22 18:49:34 +00:00
Sarah Oslund
961afaed10
Merge pull request #6215 from dotnet-maestro-bot/merge/release/3.1.2xx-to-master 
[automated] Merge branch 'release/3.1.2xx' => 'master'
 2020-01-22 08:23:16 -08:00
dotnet-maestro[bot]
5c22683aba
Update dependencies from https://github.com/dotnet/toolset build 20200122.3 (#6225) 
- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20072.3

Dependency coherency updates

- Microsoft.DotNet.Common.ItemTemplates - 5.0.0-alpha1.20072.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20072.3 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-22 15:35:47 +00:00
dotnet-maestro[bot]
e9c2176645
Update dependencies from https://github.com/dotnet/toolset build 20200122.2 (#6224) 
- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20072.2

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20072.2 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-22 15:05:53 +00:00
dotnet-maestro[bot]
53374ddbb8
Update dependencies from https://github.com/dotnet/windowsdesktop build 20200122.1 (#6223) 
- Microsoft.WindowsDesktop.App - 5.0.0-alpha.1.20072.1
- Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-alpha.1.20072.1
- Microsoft.WindowsDesktop.App.Ref - 5.0.0-alpha.1.20072.1
 2020-01-22 15:05:37 +00:00
dotnet-maestro[bot]
19b6d61b9a
Update dependencies from https://github.com/dotnet/toolset build 20200122.1 (#6222) 
- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20072.1

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20072.1 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-22 14:40:14 +00:00
dotnet-maestro[bot]
4c773f3a13
Update dependencies from https://github.com/dotnet/arcade build 20200121.3 (#6220) 
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20071.3
 2020-01-22 13:31:03 +00:00
dotnet-maestro[bot]
ec9a4c6f17
Update dependencies from https://github.com/dotnet/toolset build 20200121.5 (#6219) 
- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20071.5

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20071.5 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-22 05:40:36 +00:00
dotnet-maestro[bot]
9108fc817e
Update dependencies from https://github.com/dotnet/aspnetcore build 20200121.6 (#6218) 
- VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-alpha.1.20071.6
- dotnet-user-secrets - 5.0.0-alpha.1.20071.6
- dotnet-watch - 5.0.0-alpha.1.20071.6
- Microsoft.AspNetCore.App.Ref - 5.0.0-alpha.1.20071.6
- Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-alpha.1.20071.6
- dotnet-dev-certs - 5.0.0-alpha.1.20071.6
 2020-01-22 04:20:55 +00:00
Sarah Oslund
0889b1646a Merge branch 'release/3.1.2xx' into Merge3.1.2AndMaster 2020-01-21 16:48:07 -08:00
dotnet-maestro[bot]
2a4855c72c
Update dependencies from https://github.com/dotnet/toolset build 20200121.3 (#6216) 
- Microsoft.Dotnet.Toolset.Internal - 5.0.100-alpha.1.20071.3

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-alpha.1.20071.3 (parent: Microsoft.Dotnet.Toolset.Internal)
 2020-01-21 22:05:40 +00:00
Sarah Oslund
762f617853
Merge pull request #6179 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-21 12:54:58 -08:00
Sarah Oslund
094a0c5a38
Merge pull request #6176 from dotnet-maestro-bot/merge/release/3.1.2xx-to-master 
[automated] Merge branch 'release/3.1.2xx' => 'master'
 2020-01-21 11:46:13 -08:00
sfoslund
46b8ddf0b5 Reverting drop suffix change 2020-01-21 11:24:22 -08:00
Sarah Oslund
88823e6e6c Merge branch 'release/3.1.2xx' into Merging3.1.2AndMaster 2020-01-21 11:18:35 -08:00
Sarah Oslund
672d0ec1e2 Merge branch 'release/3.1.1xx' into Merging3.1And3.2 2020-01-21 08:40:01 -08:00