simplify tag names

Configuration/src/CloudFoundry/CloudFoundry.feature

@@ -4,8 +4,8 @@ Feature: CloudFoundry Configuration
   You can run some CloudFoundry configuration samples
 
   @net6.0
-  @win10-x64
-  Scenario: CloudFoundry Configuration (net6.0/win10-x64)
+  @win10
+  Scenario: CloudFoundry Configuration (net6.0/win10)
     When you run: dotnet publish -r win10-x64
     And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net6.0/win10-x64/publish
     And you wait until CloudFoundry app cloud is started
@@ -13,8 +13,8 @@ Feature: CloudFoundry Configuration
     Then you should see "vcap:application:application_name = cloud"
 
   @net6.0
-  @linux-x64
-  Scenario: CloudFoundry Configuration (net6.0/linux-x64)
+  @linux
+  Scenario: CloudFoundry Configuration (net6.0/linux)
     When you run: dotnet build -r linux-x64
     And you run in the background: cf push -f manifest.yml
     And you wait until CloudFoundry app cloud is started

Configuration/src/SimpleCloudFoundry/SimpleCloudFoundry.feature

@@ -4,8 +4,8 @@ Feature: Simple CloudFoundry Configuration
   You can run some simple CloudFoundry configuration samples
 
   @net6.0
-  @win10-x64
-  Scenario: Simple CloudFoundry Configuration (net6.0/win10-x64)
+  @win10
+  Scenario: Simple CloudFoundry Configuration (net6.0/win10)
     When you run: dotnet publish -r win10-x64
     And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net6.0/win10-x64/publish
     And you wait until CloudFoundry app foo is started
@@ -13,8 +13,8 @@ Feature: Simple CloudFoundry Configuration
     Then you should see "spring:cloud:config:name = foo"
 
   @net6.0
-  @linux-x64
-  Scenario: Simple CloudFoundry Configuration (net6.0/linux-x64)
+  @linux
+  Scenario: Simple CloudFoundry Configuration (net6.0/linux)
     When you run: dotnet build
     And you run in the background: cf push -f manifest.yml
     And you wait until CloudFoundry app foo is started

Connectors/src/MySql/MySql.feature

@@ -4,8 +4,8 @@ Feature: MySql Connector
   You can run some MySql connection samples
 
   @net6.0
-  @win10-x64
-  Scenario: MySql Connector (net6.0/win10-x64)
+  @win10
+  Scenario: MySql Connector (net6.0/win10)
     When you run: dotnet publish -r win10-x64
     And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net6.0/win10-x64/publish
     And you wait until CloudFoundry app mysql-connector is started
@@ -14,8 +14,8 @@ Feature: MySql Connector
     And you should see "Key 2 = Row2 Text"
 
   @net6.0
-  @linux-x64
-  Scenario: MySql Connector (net6.0/linux-x64)
+  @linux
+  Scenario: MySql Connector (net6.0/linux)
     When you run in the background: cf push -f manifest.yml
     And you wait until CloudFoundry app mysql-connector is started
     When you get https://mysql-connector.x.y.z/Home/MySqlData

Connectors/src/MySqlEFCore/MySqlEFCore.feature

@@ -4,8 +4,8 @@ Feature: MySqlEFCore Connector
   You can run some MySql using EntityFramework Core connection samples
 
   @net6.0
-  @win10-x64
-  Scenario: MySqlEFCore Connector (net6.0/win10-x64)
+  @win10
+  Scenario: MySqlEFCore Connector (net6.0/win10)
     When you run: dotnet publish -r win10-x64
     And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net6.0/win10-x64/publish
     And you wait until CloudFoundry app mysqlefcore-connector is started
@@ -14,8 +14,8 @@ Feature: MySqlEFCore Connector
     And you should see "2: Test Data 2 - EF Core TestContext B"
 
   @net6.0
-  @linux-x64
-  Scenario: MySqlEFCore Connector (net6.0/linux-x64)
+  @linux
+  Scenario: MySqlEFCore Connector (net6.0/linux)
     When you run in the background: cf push -f manifest.yml
     And you wait until CloudFoundry app mysqlefcore-connector is started
     When you get https://mysqlefcore-connector.x.y.z/Home/MySqlData

Connectors/src/PostgreEFCore/PostgreEFCore.feature

@@ -4,8 +4,8 @@ Feature: PostgreEFCore Connector
   You can run some PostgreSql using EntityFramework Core connection samples
 
   @net6.0
-  @win10-x64
-  Scenario: PostgreEFCore Connector (net6.0/win10-x64)
+  @win10
+  Scenario: PostgreEFCore Connector (net6.0/win10)
     When you run: dotnet publish -r win10-x64
     And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net6.0/win10-x64/publish
     And you wait until CloudFoundry app postgresefcore-connector is started
@@ -14,8 +14,8 @@ Feature: PostgreEFCore Connector
     And you should see "2: Test Data 2 - EF Core TestContext"
 
   @net6.0
-  @linux-x64
-  Scenario: PostgreEFCore Connector (net6.0/linux-x64)
+  @linux
+  Scenario: PostgreEFCore Connector (net6.0/linux)
     When you run in the background: cf push -f manifest.yml
     And you wait until CloudFoundry app postgresefcore-connector is started
     When you get https://postgresefcore-connector.x.y.z/Home/PostgresData

Connectors/src/PostgreSql/PostgreSql.feature

@@ -4,8 +4,8 @@ Feature: PostgreSql Connector
   You can run some PostgreSql connection samples
 
   @net6.0
-  @win10-x64
-  Scenario: PostgreSql Connector (net6.0/win10-x64)
+  @win10
+  Scenario: PostgreSql Connector (net6.0/win10)
     When you run: dotnet publish -r win10-x64
     And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net6.0/win10-x64/publish
     And you wait until CloudFoundry app postgres-connector is started
@@ -14,8 +14,8 @@ Feature: PostgreSql Connector
     And you should see "Key 2 = Row2 Text"
 
   @net6.0
-  @linux-x64
-  Scenario: PostgreSql Connector (net6.0/linux-x64)
+  @linux
+  Scenario: PostgreSql Connector (net6.0/linux)
     When you run in the background: cf push -f manifest.yml
     And you wait until CloudFoundry app postgres-connector is started
     When you get https://postgres-connector.x.y.z/Home/PostgresData

Connectors/src/RabbitMQ/RabbitMQ.feature

@@ -4,8 +4,8 @@ Feature: RabbitMQ Connector
   You can run some RabbitMQ connection samples
 
   @net6.0
-  @win10-x64
-  Scenario: Rabbit Connector (net6.0/win10-x64)
+  @win10
+  Scenario: Rabbit Connector (net6.0/win10)
     When you run: dotnet publish -r win10-x64
     And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net6.0/win10-x64/publish
     And you wait until CloudFoundry app rabbitmq-connector is started
@@ -14,8 +14,8 @@ Feature: RabbitMQ Connector
     Then you should see "Message=HEY THERE"
 
   @net6.0
-  @linux-x64
-  Scenario: Rabbit Connector (net6.0/linux-x64)
+  @linux
+  Scenario: Rabbit Connector (net6.0/linux)
     When you run in the background: cf push -f manifest.yml
     And you wait until CloudFoundry app rabbitmq-connector is started
     When you post "Message=HEY THERE" to https://rabbitmq-connector.x.y.z/RabbitMQ/Send

Connectors/src/Redis/Redis.feature

@@ -4,8 +4,8 @@ Feature: Redis Connector
   You can run some Redis connection samples
 
   @net6.0
-  @win10-x64
-  Scenario: Redis Connector (net6.0/win10-x64)
+  @win10
+  Scenario: Redis Connector (net6.0/win10)
     When you run: dotnet publish -r win10-x64
     And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net6.0/win10-x64/publish
     And you wait until CloudFoundry app redis-connector is started
@@ -14,8 +14,8 @@ Feature: Redis Connector
     And you should see "Key2=Key2Value"
 
   @net6.0
-  @linux-x64
-  Scenario: Redis Connector (net6.0/linux-x64)
+  @linux
+  Scenario: Redis Connector (net6.0/linux)
     When you run in the background: cf push -f manifest.yml
     And you wait until CloudFoundry app redis-connector is started
     When you get https://redis-connector.x.y.z/Home/CacheData

Management/src/CloudFoundry/CF.feature

@@ -4,16 +4,16 @@ Feature: Cloud Foundry Samples
   You can run some Steeltoe Management Endpoint samples
 
   @net6.0
-  @win10-x64
-  Scenario: CloudFoundry Management (net6.0/win10-x64)
+  @win10
+  Scenario: CloudFoundry Management (net6.0/win10)
     When you run: dotnet publish -r win10-x64
     And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net6.0/win10-x64/publish
     And you wait until CloudFoundry app actuator is started
     Then you should be able to access CloudFoundry app actuator management endpoints
 
   @net6.0
-  @linux-x64
-  Scenario: CloudFoundry Management (net6.0/linux-x64)
+  @linux
+  Scenario: CloudFoundry Management (net6.0/linux)
     When you run in the background: cf push -f manifest.yml
     And you wait until CloudFoundry app actuator is started
     Then you should be able to access CloudFoundry app actuator management endpoints

Security/src/CloudFoundrySingleSignon/CloudFoundrySingleSignon.feature

@@ -4,8 +4,8 @@ Feature: CloudFoundry Single SignOn
   You can run some CloudFoundry Single SignOn samples
 
   @net6.0
-  @win10-x64
-  Scenario: CloudFoundry Single SignOn (net6.0/win10-x64)
+  @win10
+  Scenario: CloudFoundry Single SignOn (net6.0/win10)
     When you run: dotnet publish -f net6.0 -r win10-x64
     And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net6.0/win10-x64/publish
     And you wait until CloudFoundry app single-signon is started
@@ -19,8 +19,8 @@ Feature: CloudFoundry Single SignOn
     And you should see "Your About page."
 
   @net6.0
-  @linux-x64
-  Scenario: CloudFoundry Single SignOn (net6.0/linux-x64)
+  @linux
+  Scenario: CloudFoundry Single SignOn (net6.0/linux)
     When you run in the background: cf push -f manifest.yml
     And you wait until CloudFoundry app single-signon is started
     When you get https://single-signon.x.y.z/Home/About