Commit 90070eaf authored by Michael Graves's avatar Michael Graves
Browse files

Merge branch '20_1_Updates' into 'master'

Updates for 20.1 release

See merge request bisimulations/ExampleShoppingCart!6
parents bb81ec1e 94753feb
......@@ -4,10 +4,14 @@ build/*/
build/vs2010/*/
!build/vs2012
build/vs2012/*/
!build/vs2013
build/vs2013/*/
!build/vs2015
build/vs2015/*/
!build/vs2017
build/vs2017/*/
!build/vs2019
build/vs2019/*/
!build/giri
build/giri/Binaries
build/giri/environment.properties
......
......@@ -68,9 +68,9 @@ Dependencies:
- Name: Library
Dependencies:
- Name: GTest
Version: 1.6.1
Version: 1.6.2
- Name: ComponentAPI
Version: 5
UUID: a64997cc-611c-499f-821d-7d9fece7cfe8
YmlVersion: 3
YmlVersion: 6
UsingPropertyFiles: true
......@@ -4,6 +4,6 @@
# Manually modify MajorVersion and MinorVersion below to control the version embedded within the binary files.
# The PatchVersion is automatically set and incremented by giri to ensure the full version number is always unique on Artifactory.
MajorVersion: 19
MajorVersion: 20
MinorVersion: 1
#PatchVersion: Auto incremented by giri, not manually settable
......@@ -14,4 +14,4 @@ Dependencies:
Version: 6
- Group: Dependencies
Name: GTest
Version: 1.6.1
Version: 1.6.2
No preview for this file type
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment