Merge pull request #1082 from aws/shruti0085/telemetryUpdate

Migrate C# telemetry generator to  .NET AWSDK v4

Author: XiaoxuanLu

telemetry/csharp/AwsToolkit.Telemetry.Events.Tests/Generated/GeneratedCode.cs

@@ -6,6 +6,7 @@
 		<AssemblyName>Amazon.AwsToolkit.Telemetry.SDK</AssemblyName>
 		<PackageId>AWS.Toolkit.Telemetry.SDK</PackageId>
 		<TargetFramework>net472</TargetFramework>
+		<LangVersion>9.0</LangVersion>
 		<Authors>Amazon Web Services</Authors>
 		<Company>Amazon Web Services</Company>
 		<Product>AWS Toolkit Telemetry</Product>
@@ -21,7 +22,7 @@
 		<AssemblyOriginatorKeyFile>..\toolkit-telemetry.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="AWSSDK.Core" Version="3.7.13.1" />
+		<PackageReference Include="AWSSDK.Core" Version="4.0.0.28" />
 	</ItemGroup>
 	<ItemGroup>
 		<Reference Include="System" />

telemetry/csharp/AwsToolkit.Telemetry.SDK/AwsToolkit.Telemetry.SDK.csproj

@@ -14,7 +14,7 @@
     <tags>AWS AWSToolkit</tags>
     <dependencies>
       <group targetFramework="net472">
-        <dependency id="AWSSDK.Core" version="3.7.13.1" />
+        <dependency id="AWSSDK.Core" version="4.0.0.28" />
       </group>
     </dependencies>
   </metadata>

telemetry/csharp/AwsToolkit.Telemetry.SDK/AwsToolkit.Telemetry.SDK.nuspec

@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ * 
+ *  http://aws.amazon.com/apache2.0
+ * 
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+using Amazon.Runtime;
+using Amazon.Runtime.Endpoints;
+using Amazon.Runtime.Internal;
+
+namespace Amazon.ToolkitTelemetry
+{
+    /// <summary>
+    /// Configuration for accessing Amazon ToolkitTelemetry service - Custom partial class
+    /// </summary>
+    public partial class AmazonToolkitTelemetryConfig
+    {
+        /// <summary>
+        /// Returns the endpoint that will be used for a particular request.
+        /// </summary>
+        /// <param name="parameters">A Container class for parameters used for endpoint resolution.</param>
+        /// <returns>The resolved endpoint for the given request.</returns>
+        public override Amazon.Runtime.Endpoints.Endpoint DetermineServiceOperationEndpoint(ServiceOperationEndpointParameters parameters)
+        {
+            var request = new DefaultRequest(parameters.Request, ServiceId);
+            request.AlternateEndpoint = parameters.AlternateEndpoint;
+            
+            var requestContext = new RequestContext(false);
+            requestContext.ClientConfig = this;
+            requestContext.OriginalRequest = parameters.Request;
+            requestContext.Request = request;
+            var executionContext = new Amazon.Runtime.Internal.ExecutionContext(requestContext, null);
+            return new BaseEndpointResolver().GetEndpoint(executionContext);
+        }
+    }
+}

telemetry/csharp/AwsToolkit.Telemetry.SDK/Custom/AmazonToolkitTelemetryConfig.Partial.cs

@@ -4,7 +4,7 @@
 		<BuildRoot Condition="'$(BuildRoot)' == ''">$(MSBuildThisFileDirectory)</BuildRoot>
 
         <BuildTemp>$(BuildRoot)buildtemp\</BuildTemp>
-        <DotNetSdkTag>3.7.354.0</DotNetSdkTag>
+        <DotNetSdkTag>4.0.92.0</DotNetSdkTag>
         <DotNetSdkClone>$(BuildTemp)dotnetsdk\</DotNetSdkClone>
         <SdkGeneratorRoot>$(DotNetSdkClone)generator\</SdkGeneratorRoot>
         <SdkGenerator>$(SdkGeneratorRoot)ServiceClientGenerator\bin\Release\ServiceClientGenerator.exe</SdkGenerator>
@@ -52,6 +52,9 @@
 
     <!-- Produce a generated csproj and files in a temp location -->
     <Target Name="generate-raw-telemetry-client">
+        <!-- Create TestServiceModels folder -->
+        <MakeDir Directories="$(BuildRoot)..\TestServiceModels" />
+        <Message Text="Created TestServiceModels folder" />
 
         <!-- Pull together Sdk Generator input files -->
         <ItemGroup>
@@ -98,6 +101,7 @@
     <Target Name="cleanup">
         <RemoveDir Directories="$(BuildTemp)" />
         <RemoveDir Directories="$(BuildRoot)\sdk" />
+        <RemoveDir Directories="$(BuildRoot)..\TestServiceModels" />
     </Target>
 
 </Project>

telemetry/csharp/TelemetryClient.proj

@@ -1,7 +1,7 @@
 {
     "file-description": "This file is used by the SDK Client Generator. See telemetry/csharp/README.md for details",
-    "ProductVersion": "3.3.716.0",
-    "CoreVersion": "3.3.106.2",
+    "ProductVersion": "4.0.92.0",
+    "CoreVersion": "4.0.0.28",
     "DefaultToPreview": false,
     "ServiceVersions": {
         "ToolkitTelemetry": {

telemetry/csharp/client-generator-inputs/sdk-versions.json

@@ -1,3 +1,3 @@
 {
     "file-description": "This file is used by the SDK Client Generator. See telemetry/csharp/README.md for details"
-}
+}